Juan Francisco Cantero Hurtado <i...@juanfra.info> writes: > On Sat, Mar 12, 2016 at 08:33:54AM +0200, Timo Myyrä wrote: > >> Hi, >> >> Seems my ports@ subscription had dropped so the late reply. >> >> Your right in that patching the missing file is a bit ugly. >> Here's take 2 to use pre-build step to issue simple copy. >> >> 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 12 Mar 2016 06:36:04 -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 >> @@ -45,5 +45,9 @@ LIB_DEPENDS += devel/gmp \ >> devel/libffi >> >> TEST_DEPENDS = ${BASE_PKGPATH} >> + >> +# XXX: Workaround for missing Copyright file >> +pre-build: >> + @cp ${WRKSRC}/{LICENSE,Copyright} > > I would prefer "post-patch" instead of "pre-build". > > BTW, why do you need copy manually the file? > >> >> .include <bsd.port.mk> >> 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 12 Mar 2016 06:36:04 -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-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 12 Mar 2016 06:36:04 -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 >> +$OpenBSD$ >> +--- src/configure.orig Thu Mar 10 22:19:22 2016 >> ++++ src/configure Thu Mar 10 22:20:21 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 >> >>
Okay, here's one with copy being done in post-configure. The Copyright file is not present in the release tarball but is still referenced in Makefiles. This seems to been fixed post-release: https://gitlab.com/embeddable-common-lisp/ecl/commit/77640536476ac51c77e13f13fa06461f90abde63 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 12 Mar 2016 20:18:04 -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 @@ -45,5 +45,9 @@ LIB_DEPENDS += devel/gmp \ devel/libffi TEST_DEPENDS = ${BASE_PKGPATH} + +# XXX: Workaround for missing Copyright file +post-configure: + @cp ${WRKSRC}/{LICENSE,Copyright} .include <bsd.port.mk> 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 12 Mar 2016 20:18:04 -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-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 12 Mar 2016 20:18:04 -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 +$OpenBSD$ +--- src/configure.orig Thu Mar 10 22:19:22 2016 ++++ src/configure Thu Mar 10 22:20:21 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
