1) reorder, cleanup and aligned in Makefile 2) add CONFIGURE_ARGS += --enable-unicode 3) fix replacement of ecl-config.1 on ecl.1 4) remove create symlinks lib/libecl.so
-- Alexandr Shadchin Index: Makefile =================================================================== RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile 4 Dec 2010 14:36:19 -0000 1.10 +++ Makefile 4 Dec 2010 15:37:41 -0000 @@ -1,53 +1,53 @@ # $OpenBSD: Makefile,v 1.10 2010/12/04 14:36:19 espie Exp $ -COMMENT = embeddable common-lisp -CATEGORIES = lang +COMMENT = embeddable common-lisp +BROKEN-hppa = infinite loop during build -BROKEN-hppa = infinite loop during build +V = 10.4.1 +DISTNAME = ecl-$V +SHARED_LIBS = ecl 0.1 -V = 10.4.1 -DISTNAME = ecl-$V -SHARED_LIBS += ecl 1.0 +CATEGORIES = lang -HOMEPAGE = http://ecls.sourceforge.net/ -SUBST_VARS = V +HOMEPAGE = http://ecls.sourceforge.net/ -# GPLv2 or later -PERMIT_PACKAGE_CDROM = Yes +# LGPLv2 +PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM = Yes -PERMIT_DISTFILES_FTP = Yes +PERMIT_DISTFILES_CDROM =Yes +PERMIT_DISTFILES_FTP = Yes MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ecls/} -CONFIGURE_STYLE = gnu -USE_GMAKE = Yes -USE_LIBTOOL = Yes +WANTLIB = c gc gmp m pthread + +LIB_DEPENDS = devel/boehm-gc \ + devel/gmp + +SUBST_VARS = V + +USE_GMAKE = Yes USE_GROFF = Yes -NO_REGRESS = Yes -CONFIGURE_ENV += LDFLAGS='-pthread -L${LOCALBASE}/lib' \ + +NO_REGRESS = Yes + +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ + --enable-boehm=system \ + --enable-unicode \ + --with-system-gmp +CONFIGURE_ENV = ECLLIB_VERSION=${LIBecl_VERSION} \ CPPFLAGS=-I${LOCALBASE}/include \ - CFLAGS='${CFLAGS} -pthread' \ - ECLLIB_VERSION=${LIBecl_VERSION} + LDFLAGS=-L${LOCALBASE}/lib + +MODGNU_CONFIG_GUESS_DIRS = ${WRKDIST} \ + ${WRKDIST}/src + FLAVORS = debug FLAVOR ?= -CONFIGURE_ARGS += --enable-boehm=system \ - --with-system-gmp \ - --with-gmp-prefix=${LOCALBASE} \ - .if ${FLAVOR:L:Mdebug} CONFIGURE_ARGS += --with-debug-cflags=-g .endif - -MODGNU_CONFIG_GUESS_DIRS = ${WRKDIST} \ - ${WRKDIST}/src \ - ${WRKDIST}/src/gc \ - ${WRKDIST}/src/gmp - -LIB_DEPENDS += devel/gmp \ - devel/boehm-gc - -WANTLIB += c gc gmp m pthread .include <bsd.port.mk> Index: patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/lang/ecl/patches/patch-src_Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_Makefile_in --- patches/patch-src_Makefile_in 4 Dec 2010 14:36:19 -0000 1.2 +++ patches/patch-src_Makefile_in 4 Dec 2010 15:37:41 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2010/12/04 14:36:19 espie Exp $ ---- src/Makefile.in.orig Sun Apr 4 16:31:27 2010 -+++ src/Makefile.in Sun Nov 28 20:14:34 2010 +--- src/Makefile.in.orig Sun Apr 4 20:31:27 2010 ++++ src/Makefile.in Wed Jul 28 23:42:45 2010 @@ -152,6 +152,7 @@ install: for i in BUILD-STAMP help.doc TAGS ; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \ @@ -9,7 +9,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 20 for i in $(LSP_LIBRARIES) $(LIBRARIES); do \ if test -s $$i ; then \ if echo $$i | grep dll; then \ -@@ -160,13 +161,7 @@ install: +@@ -160,25 +161,15 @@ install: $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \ fi \ done @@ -20,7 +20,20 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 20 - $(LN_S) @SONAME3@ @SONAME1@ && \ - $(LN_S) @SONAME3@ @SONAME@ ) \ - fi -+ cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so for i in c/dpp$(EXE) ecl_min$(EXE) `cat MODULES`; do \ case $$i in \ *.fas) $(INSTALL_PROGRAM) $$i $(DESTDIR)$(ecldir);; \ + *) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \ + esac \ + done +- for i in Copyright LGPL; do \ +- $(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(libdir); \ +- done + $(mkinstalldirs) $(DESTDIR)$(mandir)/man$(manext) +- for i in doc/ecl.man doc/ecl-config.man; do \ +- $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man$(manext)/ecl.$(manext); \ ++ for i in ecl ecl-config; do \ ++ $(INSTALL_DATA) doc/$$i.man $(DESTDIR)$(mandir)/man$(manext)/$$i.$(manext); \ + done + + flatinstall: BUILD-STAMP Index: patches/patch-src_configure =================================================================== RCS file: /cvs/ports/lang/ecl/patches/patch-src_configure,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_configure --- patches/patch-src_configure 4 Dec 2010 14:36:19 -0000 1.2 +++ patches/patch-src_configure 4 Dec 2010 15:37:41 -0000 @@ -1,14 +1,16 @@ $OpenBSD: patch-src_configure,v 1.2 2010/12/04 14:36:19 espie Exp $ ---- src/configure.orig Sun Apr 4 16:31:32 2010 -+++ src/configure Sun Nov 28 20:13:19 2010 -@@ -13715,13 +13715,14 @@ _ACEOF - - fi - -+: ${ECLLIB_VERSION:=8.12} - if test ${enable_shared} = "yes"; then - - cat >>confdefs.h <<\_ACEOF +--- src/configure.orig Sun Apr 4 20:31:32 2010 ++++ src/configure Fri Jul 23 00:18:53 2010 +@@ -4459,7 +4459,7 @@ case "${host_os}" in + SHARED_LDFLAGS="-shared ${LDFLAGS}" + BUNDLE_LDFLAGS="-shared ${LDFLAGS}" + ECL_LDRPATH="-Wl,--rpath,~A" +- clibs="-lpthread -lm" ++ clibs="-pthread -lm" + SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION" + SONAME_LDFLAGS="-Wl,-soname,SONAME" + ;; +@@ -13721,7 +13721,7 @@ cat >>confdefs.h <<\_ACEOF #define ENABLE_DLOPEN 1 _ACEOF Index: pkg/PFRAG.shared =================================================================== RCS file: /cvs/ports/lang/ecl/pkg/PFRAG.shared,v retrieving revision 1.2 diff -u -p -r1.2 PFRAG.shared --- pkg/PFRAG.shared 16 Mar 2009 11:19:12 -0000 1.2 +++ pkg/PFRAG.shared 4 Dec 2010 15:37:41 -0000 @@ -1,3 +1,2 @@ @comment $OpenBSD: PFRAG.shared,v 1.2 2009/03/16 11:19:12 espie Exp $ -lib/libecl.so @lib lib/libecl.so.${LIBecl_VERSION} Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/ecl/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 4 Dec 2010 14:36:19 -0000 1.4 +++ pkg/PLIST 4 Dec 2010 15:37:41 -0000 @@ -18,8 +18,6 @@ include/ecl/object.h include/ecl/page.h include/ecl/stacks.h include/ecl/unify.h -lib/Copyright -lib/LGPL lib/ecl-${V}/ lib/ecl-${V}/BUILD-STAMP lib/ecl-${V}/TAGS @@ -32,6 +30,151 @@ lib/ecl-${V}/defsystem.asd @bin lib/ecl-${V}/defsystem.fas lib/ecl-${V}/dpp lib/ecl-${V}/ecl_min +lib/ecl-${V}/encodings/ +lib/ecl-${V}/encodings/ARABIC +lib/ecl-${V}/encodings/ASCII +lib/ecl-${V}/encodings/ATARIST.BIN +lib/ecl-${V}/encodings/CP-856.BIN +lib/ecl-${V}/encodings/CP819 +lib/ecl-${V}/encodings/CP850 +lib/ecl-${V}/encodings/CP862 +lib/ecl-${V}/encodings/CP866 +lib/ecl-${V}/encodings/CP932 +lib/ecl-${V}/encodings/CP936 +lib/ecl-${V}/encodings/CP949 +lib/ecl-${V}/encodings/CP950 +lib/ecl-${V}/encodings/CYRILLIC +lib/ecl-${V}/encodings/DOS-CP437.BIN +lib/ecl-${V}/encodings/DOS-CP737.BIN +lib/ecl-${V}/encodings/DOS-CP775.BIN +lib/ecl-${V}/encodings/DOS-CP850.BIN +lib/ecl-${V}/encodings/DOS-CP852.BIN +lib/ecl-${V}/encodings/DOS-CP855.BIN +lib/ecl-${V}/encodings/DOS-CP857.BIN +lib/ecl-${V}/encodings/DOS-CP860.BIN +lib/ecl-${V}/encodings/DOS-CP861.BIN +lib/ecl-${V}/encodings/DOS-CP862.BIN +lib/ecl-${V}/encodings/DOS-CP863.BIN +lib/ecl-${V}/encodings/DOS-CP864.BIN +lib/ecl-${V}/encodings/DOS-CP865.BIN +lib/ecl-${V}/encodings/DOS-CP866.BIN +lib/ecl-${V}/encodings/DOS-CP869.BIN +lib/ecl-${V}/encodings/DOS-CP874.BIN +lib/ecl-${V}/encodings/ECMA-118 +lib/ecl-${V}/encodings/GREEK +lib/ecl-${V}/encodings/HEBREW +lib/ecl-${V}/encodings/IBM437 +lib/ecl-${V}/encodings/IBM819 +lib/ecl-${V}/encodings/IBM850 +lib/ecl-${V}/encodings/IBM852 +lib/ecl-${V}/encodings/IBM855 +lib/ecl-${V}/encodings/IBM857 +lib/ecl-${V}/encodings/IBM860 +lib/ecl-${V}/encodings/IBM861 +lib/ecl-${V}/encodings/IBM862 +lib/ecl-${V}/encodings/IBM863 +lib/ecl-${V}/encodings/IBM864 +lib/ecl-${V}/encodings/IBM865 +lib/ecl-${V}/encodings/IBM866 +lib/ecl-${V}/encodings/IBM869 +lib/ecl-${V}/encodings/ISO-2022-JP +lib/ecl-${V}/encodings/ISO-2022-JP-1 +lib/ecl-${V}/encodings/ISO-8859-1.BIN +lib/ecl-${V}/encodings/ISO-8859-10.BIN +lib/ecl-${V}/encodings/ISO-8859-11.BIN +lib/ecl-${V}/encodings/ISO-8859-13.BIN +lib/ecl-${V}/encodings/ISO-8859-14.BIN +lib/ecl-${V}/encodings/ISO-8859-15.BIN +lib/ecl-${V}/encodings/ISO-8859-16.BIN +lib/ecl-${V}/encodings/ISO-8859-2.BIN +lib/ecl-${V}/encodings/ISO-8859-3.BIN +lib/ecl-${V}/encodings/ISO-8859-4.BIN +lib/ecl-${V}/encodings/ISO-8859-5.BIN +lib/ecl-${V}/encodings/ISO-8859-6.BIN +lib/ecl-${V}/encodings/ISO-8859-7.BIN +lib/ecl-${V}/encodings/ISO-8859-8.BIN +lib/ecl-${V}/encodings/ISO-8859-9.BIN +lib/ecl-${V}/encodings/JISX0201.BIN +lib/ecl-${V}/encodings/JISX0208.BIN +lib/ecl-${V}/encodings/JISX0212.BIN +lib/ecl-${V}/encodings/KOI8-R.BIN +lib/ecl-${V}/encodings/KOI8-U.BIN +lib/ecl-${V}/encodings/KOI8R +lib/ecl-${V}/encodings/LATIN-0 +lib/ecl-${V}/encodings/LATIN-1 +lib/ecl-${V}/encodings/LATIN-10 +lib/ecl-${V}/encodings/LATIN-11 +lib/ecl-${V}/encodings/LATIN-2 +lib/ecl-${V}/encodings/LATIN-3 +lib/ecl-${V}/encodings/LATIN-4 +lib/ecl-${V}/encodings/LATIN-5 +lib/ecl-${V}/encodings/LATIN-6 +lib/ecl-${V}/encodings/LATIN-7 +lib/ecl-${V}/encodings/LATIN-8 +lib/ecl-${V}/encodings/LATIN-9 +lib/ecl-${V}/encodings/LATIN0 +lib/ecl-${V}/encodings/LATIN1 +lib/ecl-${V}/encodings/LATIN10 +lib/ecl-${V}/encodings/LATIN11 +lib/ecl-${V}/encodings/LATIN2 +lib/ecl-${V}/encodings/LATIN3 +lib/ecl-${V}/encodings/LATIN4 +lib/ecl-${V}/encodings/LATIN5 +lib/ecl-${V}/encodings/LATIN6 +lib/ecl-${V}/encodings/LATIN7 +lib/ecl-${V}/encodings/LATIN8 +lib/ecl-${V}/encodings/LATIN9 +lib/ecl-${V}/encodings/MS-ANSI +lib/ecl-${V}/encodings/MS-ARAB +lib/ecl-${V}/encodings/MS-CYRL +lib/ecl-${V}/encodings/MS-EE +lib/ecl-${V}/encodings/MS-GREEK +lib/ecl-${V}/encodings/MS-HEBR +lib/ecl-${V}/encodings/MS-TURK +lib/ecl-${V}/encodings/SHIFT-JIS.BIN +lib/ecl-${V}/encodings/THAI +lib/ecl-${V}/encodings/UCS2 +lib/ecl-${V}/encodings/UCS2BE +lib/ecl-${V}/encodings/UCS2LE +lib/ecl-${V}/encodings/UCS4 +lib/ecl-${V}/encodings/UCS4BE +lib/ecl-${V}/encodings/UCS4LE +lib/ecl-${V}/encodings/UNICODE +lib/ecl-${V}/encodings/UTF-16 +lib/ecl-${V}/encodings/UTF-16BE +lib/ecl-${V}/encodings/UTF-16LE +lib/ecl-${V}/encodings/UTF-32 +lib/ecl-${V}/encodings/UTF-32BE +lib/ecl-${V}/encodings/UTF-32LE +lib/ecl-${V}/encodings/UTF-8 +lib/ecl-${V}/encodings/WINBALTRIM +lib/ecl-${V}/encodings/WINDOWS-1250 +lib/ecl-${V}/encodings/WINDOWS-1251 +lib/ecl-${V}/encodings/WINDOWS-1252 +lib/ecl-${V}/encodings/WINDOWS-1253 +lib/ecl-${V}/encodings/WINDOWS-1254 +lib/ecl-${V}/encodings/WINDOWS-1255 +lib/ecl-${V}/encodings/WINDOWS-1256 +lib/ecl-${V}/encodings/WINDOWS-1257 +lib/ecl-${V}/encodings/WINDOWS-1258 +lib/ecl-${V}/encodings/WINDOWS-932 +lib/ecl-${V}/encodings/WINDOWS-936 +lib/ecl-${V}/encodings/WINDOWS-949 +lib/ecl-${V}/encodings/WINDOWS-950 +lib/ecl-${V}/encodings/WINDOWS-CP1250.BIN +lib/ecl-${V}/encodings/WINDOWS-CP1251.BIN +lib/ecl-${V}/encodings/WINDOWS-CP1252.BIN +lib/ecl-${V}/encodings/WINDOWS-CP1253.BIN +lib/ecl-${V}/encodings/WINDOWS-CP1254.BIN +lib/ecl-${V}/encodings/WINDOWS-CP1255.BIN +lib/ecl-${V}/encodings/WINDOWS-CP1256.BIN +lib/ecl-${V}/encodings/WINDOWS-CP1257.BIN +lib/ecl-${V}/encodings/WINDOWS-CP1258.BIN +lib/ecl-${V}/encodings/WINDOWS-CP932.BIN +lib/ecl-${V}/encodings/WINDOWS-CP936.BIN +lib/ecl-${V}/encodings/WINDOWS-CP949.BIN +lib/ecl-${V}/encodings/WINDOWS-CP950.BIN +lib/ecl-${V}/encodings/tools.lisp lib/ecl-${V}/help.doc lib/ecl-${V}/libasdf.a lib/ecl-${V}/libbytecmp.a @@ -54,4 +197,5 @@ lib/ecl-${V}/sockets.asd @bin lib/ecl-${V}/sockets.fas lib/ecl-${V}/sysfun.lsp lib/ecl-${V}/ucd.dat +...@man man/man1/ecl-config.1 @man man/man1/ecl.1
