Hi,

Here is an update for latest version of ECL.
Seems that the Copyright file got renamed to LICENSE but Makefiles didn't get
updated for the release so this adds backports few patches to fix it.

Tested lightly on amd64, runs maxima test suite without errors.

Timo


Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ecl/Makefile,v
retrieving revision 1.27
diff -u -u -p -r1.27 Makefile
--- Makefile    25 Jan 2016 19:52:07 -0000      1.27
+++ Makefile    8 Mar 2016 05:06:56 -0000
@@ -7,9 +7,9 @@ BROKEN-mips64 = ecl_min fails
 BROKEN-sparc = infinite loop while building
 BROKEN-arm =   infinite loop while building
 
-V =            16.0.0
+V =            16.1.2
 DISTNAME =     ecl-$V
-SHARED_LIBS += ecl     4.0
+SHARED_LIBS += ecl     5.0
 SHARED_ONLY =  Yes
 
 HOMEPAGE =     https://common-lisp.net/project/ecl/
@@ -20,7 +20,7 @@ EXTRACT_SUFX =        .tgz
 # GPLv2 or later
 PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES =         ${HOMEPAGE}files/
+MASTER_SITES =         ${HOMEPAGE}files/release/${V}/
 
 CONFIGURE_STYLE =      gnu
 TEST_TARGET =          check
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/ecl/distinfo,v
retrieving revision 1.7
diff -u -u -p -r1.7 distinfo
--- distinfo    29 Aug 2015 14:48:34 -0000      1.7
+++ distinfo    8 Mar 2016 05:06:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (ecl-16.0.0.tgz) = ND7Uw+SQZWJ1emA5uFzhbTPdXoAB10AEk2eVmD468DM=
-SIZE (ecl-16.0.0.tgz) = 8009304
+SHA256 (ecl-16.1.2.tgz) = LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k=
+SIZE (ecl-16.1.2.tgz) = 7449461
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in   8 Mar 2016 05:06:56 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- Makefile.in.orig   Tue Mar  8 06:41:52 2016
++++ Makefile.in        Tue Mar  8 06:42:29 2016
+@@ -50,7 +50,7 @@ mandir=@mandir@
+ libdir=@libdir@
+ 
+ #  What to release
+-TAR_CONTENTS=Makefile.in README.1st LGPL ANNOUNCEMENT Copyright doc \
++TAR_CONTENTS=Makefile.in README.md LGPL ANNOUNCEMENT LICENSE doc \
+       configure src/c src/cmp src/clos src/CHANGELOG src/lsp src/doc \
+       src/h  src/gmp src/config* src/install.sh src/Makefile.in \
+       src/util contrib/ src/clx src/gc src/*.in src/*.m4 src/gabriel \
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/lang/ecl/patches/patch-src_Makefile_in,v
retrieving revision 1.5
diff -u -u -p -r1.5 patch-src_Makefile_in
--- patches/patch-src_Makefile_in       29 Aug 2015 14:48:34 -0000      1.5
+++ patches/patch-src_Makefile_in       8 Mar 2016 05:06:56 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_Makefile_in,v 1.5 2015/08/29 14:48:34 jasper Exp $
---- src/Makefile.in.orig       Mon Aug 24 15:25:08 2015
-+++ src/Makefile.in    Mon Aug 24 15:28:43 2015
-@@ -173,30 +173,15 @@ install:
+--- src/Makefile.in.orig       Thu Feb 25 09:06:19 2016
++++ src/Makefile.in    Tue Mar  8 06:43:19 2016
+@@ -176,34 +176,19 @@ install:
        done
        $(RM) -f $(DESTDIR)$(includedir)/ecl/config.h
        mv $(DESTDIR)$(includedir)/ecl/config-install.h 
$(DESTDIR)$(includedir)/ecl/config.h
@@ -36,3 +36,17 @@ $OpenBSD: patch-src_Makefile_in,v 1.5 20
            *) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \
          esac \
        done
+-      for i in Copyright LGPL; do \
++      for i in LICENSE LGPL; do \
+         $(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(ecldir); \
+       done
+       $(mkinstalldirs) $(DESTDIR)$(mandir)/man$(manext)
+@@ -217,7 +202,7 @@ flatinstall: build-stamp
+ uninstall:
+       for i in $(TARGETS) ecl-config; do $(RM) $(DESTDIR)$(bindir)/$$i; done
+       $(RM) -r $(DESTDIR)$(includedir)/ecl $(DESTDIR)$(ecldir)
+-      for i in $(LSP_LIBRARIES) $(LIBRARIES) Copyright LGPL; do \
++      for i in $(LSP_LIBRARIES) $(LIBRARIES) LICENSE LGPL; do \
+         $(RM) $(DESTDIR)$(libdir)/$$i || : ; \
+       done
+       $(RM) -f $(DESTDIR)$(mandir)/man$(manext)/ecl.$(manext)
Index: patches/patch-src_compile_lsp_in
===================================================================
RCS file: /cvs/ports/lang/ecl/patches/patch-src_compile_lsp_in,v
retrieving revision 1.3
diff -u -u -p -r1.3 patch-src_compile_lsp_in
--- patches/patch-src_compile_lsp_in    29 Aug 2015 14:48:34 -0000      1.3
+++ patches/patch-src_compile_lsp_in    8 Mar 2016 05:06:56 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_compile_lsp_in,v 1.3 2015/08/29 14:48:34 jasper Exp $
---- src/compile.lsp.in.orig    Mon Aug 24 15:32:27 2015
-+++ src/compile.lsp.in Mon Aug 24 15:35:06 2015
-@@ -71,19 +71,19 @@
+--- src/compile.lsp.in.orig    Thu Feb 25 09:06:19 2016
++++ src/compile.lsp.in Tue Mar  8 06:41:44 2016
+@@ -74,19 +74,19 @@
        "@LDFLAGS@ @LIBPREFIX@ecl.@LIBEXT@ @CORE_LIBS@ @FASL_LIBS@ @LIBS@")
  #+(and :wants-dlopen (not nonstop))
  (setf c::*ld-flags*
Index: patches/patch-src_configure
===================================================================
RCS file: /cvs/ports/lang/ecl/patches/patch-src_configure,v
retrieving revision 1.6
diff -u -u -p -r1.6 patch-src_configure
--- patches/patch-src_configure 29 Aug 2015 14:48:34 -0000      1.6
+++ patches/patch-src_configure 8 Mar 2016 05:06:56 -0000
@@ -1,16 +1,16 @@
 $OpenBSD: patch-src_configure,v 1.6 2015/08/29 14:48:34 jasper Exp $
---- src/configure.orig Mon Aug 24 15:30:10 2015
-+++ src/configure      Mon Aug 24 15:31:21 2015
-@@ -4948,7 +4948,7 @@ case "${host_os}" in
-               BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
-               ECL_LDRPATH="-Wl,--rpath,~A"
-               clibs="-lpthread -lm"
--              SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
-+              SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.${ECLLIB_VERSION}"
-               SONAME_LDFLAGS="-Wl,-soname,SONAME"
-               ;;
-       solaris*)
-@@ -9376,7 +9376,7 @@ if test ${enable_shared} = "yes"; then
+--- src/configure.orig Mon Mar  7 17:05:54 2016
++++ src/configure      Mon Mar  7 17:06:58 2016
+@@ -4966,7 +4966,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
+                 BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
+                 ECL_LDRPATH="-Wl,--rpath,~A"
+                 clibs="-lpthread -lm"
+-                SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
++                SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.${ECLLIB_VERSION}"
+                 SONAME_LDFLAGS="-Wl,-soname,SONAME"
+                 ;;
+         solaris*)
+@@ -9455,7 +9455,7 @@ if test ${enable_shared} = "yes"; then
  
  $as_echo "#define ENABLE_DLOPEN 1" >>confdefs.h
  
Index: patches/patch-src_doc_Makefile_in
===================================================================
RCS file: patches/patch-src_doc_Makefile_in
diff -N patches/patch-src_doc_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_doc_Makefile_in   8 Mar 2016 05:06:56 -0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+--- src/doc/Makefile.in.orig   Tue Mar  8 06:43:37 2016
++++ src/doc/Makefile.in        Tue Mar  8 06:44:34 2016
+@@ -52,7 +52,7 @@ install: all
+         fi; \
+       done
+       $(mkinstalldirs) $(DESTDIR)$(docdir)
+-      for i in Copyright LGPL; do \
++      for i in LICENSE LGPL; do \
+         $(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(docdir); \
+       done
+       $(mkinstalldirs) $(DESTDIR)$(mandir)/man$(manext)
+@@ -73,7 +73,7 @@ flatinstall: all $(HTML_FILES)
+         $(mkinstalldirs) $(DESTDIR)$(docdir)/ecldev; \
+         for i in ecldev/*; do $(INSTALL_DATA) $$i 
$(DESTDIR)$(docdir)/ecldev/; done; \
+       fi
+-      for i in Copyright LGPL; do \
++      for i in LICENSE LGPL; do \
+         $(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(docdir); \
+       done
+       for i in *.html; do $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/; done
+@@ -127,9 +127,9 @@ benchmark.html: $(srcdir)/benchmark.in.html BENCHMARK 
+        cat $(srcdir)/end) | $(FILTER) > $@
+ BENCHMARK:
+       echo "No benchmarks available" > $@
+-license.html: $(top_srcdir)/../Copyright head
++license.html: $(top_srcdir)/../LICENSE head
+       (cat head; \
+-       echo '<pre>'; cat $(top_srcdir)/../Copyright; echo '</pre>'; \
++       echo '<pre>'; cat $(top_srcdir)/../LICENSE; echo '</pre>'; \
+        cat $(srcdir)/end) | $(FILTER) > $@
+ lgpl.html: $(top_srcdir)/../LGPL head
+       (cat head; \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/ecl/pkg/PLIST,v
retrieving revision 1.7
diff -u -u -p -r1.7 PLIST
--- pkg/PLIST   29 Aug 2015 14:48:34 -0000      1.7
+++ pkg/PLIST   8 Mar 2016 05:06:56 -0000
@@ -27,8 +27,8 @@ include/ecl/page.h
 include/ecl/stacks.h
 include/ecl/unify.h
 lib/ecl/
-lib/ecl/Copyright
 lib/ecl/LGPL
+lib/ecl/LICENSE
 lib/ecl/asdf.fas
 lib/ecl/cmp.asd
 lib/ecl/cmp.fas

Reply via email to