diff options
author | minskim <minskim@pkgsrc.org> | 2006-05-17 04:29:00 +0000 |
---|---|---|
committer | minskim <minskim@pkgsrc.org> | 2006-05-17 04:29:00 +0000 |
commit | 07b98ad5676ed53a0a64594e7a6ad2f3227b15f3 (patch) | |
tree | e146345c49abd191156cedbd048f340924d27ffa /textproc | |
parent | e9fe984acd36918322793f01697218823599e586 (diff) | |
download | pkgsrc-07b98ad5676ed53a0a64594e7a6ad2f3227b15f3.tar.gz |
Use libtool to make this package build on more platforms. Approved by
jwise@.
Bump PKGREVISION.
Diffstat (limited to 'textproc')
-rw-r--r-- | textproc/tcl-expat/Makefile | 8 | ||||
-rw-r--r-- | textproc/tcl-expat/PLIST | 4 | ||||
-rw-r--r-- | textproc/tcl-expat/distinfo | 4 | ||||
-rw-r--r-- | textproc/tcl-expat/patches/patch-aa | 32 |
4 files changed, 31 insertions, 17 deletions
diff --git a/textproc/tcl-expat/Makefile b/textproc/tcl-expat/Makefile index e6b5a57b220..a958766a0f0 100644 --- a/textproc/tcl-expat/Makefile +++ b/textproc/tcl-expat/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:11:08 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/05/17 04:29:00 minskim Exp $ # DISTNAME= TclExpat-1.1 PKGNAME= tcl-expat-1.1 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= textproc www tcl MASTER_SITES= http://www.zveno.com/in-tclxml/ @@ -11,6 +11,10 @@ MAINTAINER= jwise@NetBSD.org HOMEPAGE= http://www.zveno.com/zm.cgi/in-tclxml/ COMMENT= XML parser implemented entirely in Tcl +USE_LIBTOOL= yes + +MAKE_ENV+= SHLIBTOOL=${SHLIBTOOL:Q} + pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl diff --git a/textproc/tcl-expat/PLIST b/textproc/tcl-expat/PLIST index 8e214acc95a..2f24b750355 100644 --- a/textproc/tcl-expat/PLIST +++ b/textproc/tcl-expat/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2005/04/05 10:48:57 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2006/05/17 04:29:00 minskim Exp $ lib/tcl/TclExpat-1.1/pkgIndex.tcl -lib/tcl/TclExpat-1.1/tclexpat.so +lib/tcl/TclExpat-1.1/tclexpat.la share/doc/tcl/TclExpat/README @dirrm share/doc/tcl/TclExpat @dirrm lib/tcl/TclExpat-1.1 diff --git a/textproc/tcl-expat/distinfo b/textproc/tcl-expat/distinfo index 15452c49597..9f25a0581b9 100644 --- a/textproc/tcl-expat/distinfo +++ b/textproc/tcl-expat/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 14:48:50 agc Exp $ +$NetBSD: distinfo,v 1.5 2006/05/17 04:29:00 minskim Exp $ SHA1 (TclExpat-1.1.tar.gz) = 232bb47305a471dc0f8bc52e684a04b7cf703b80 RMD160 (TclExpat-1.1.tar.gz) = 2d133137d51ffd0ca7ad638433836f97782b4e29 Size (TclExpat-1.1.tar.gz) = 268538 bytes -SHA1 (patch-aa) = c759f71496b4dd923c01d25775000cab35991627 +SHA1 (patch-aa) = 2342c07d81dba19de70feed87b69d115aef9b563 SHA1 (patch-ab) = 9985adb007741c36182d093a18c210c0230ac566 diff --git a/textproc/tcl-expat/patches/patch-aa b/textproc/tcl-expat/patches/patch-aa index 19b8b9b3e63..8a9ddd178d7 100644 --- a/textproc/tcl-expat/patches/patch-aa +++ b/textproc/tcl-expat/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2004/03/09 01:16:59 minskim Exp $ +$NetBSD: patch-aa,v 1.4 2006/05/17 04:29:00 minskim Exp $ ---- Makefile.orig 1998-08-25 02:25:20.000000000 -0500 +--- Makefile.orig 1998-08-25 07:25:20.000000000 +0000 +++ Makefile @@ -18,12 +18,12 @@ TCLEXPAT_VERSION = 1.1 @@ -8,17 +8,24 @@ $NetBSD: patch-aa,v 1.3 2004/03/09 01:16:59 minskim Exp $ TCL_OBJS = tclexpat.o -TCL_PREFIX = /usr/local/tcl/8.0 -TCL_EXEC_PREFIX = /usr/local/tcl/8.0 +-TCL_SHLIB_CFLAGS = -fPIC +-TCL_SHLIB_LD = gcc -shared +-TCL_CC = gcc +-TCL_PACKAGE_PATH = /usr/local/tcl/8.0/lib +TCL_PREFIX = ${LOCALBASE} +TCL_EXEC_PREFIX = ${LOCALBASE} - TCL_SHLIB_CFLAGS = -fPIC - TCL_SHLIB_LD = gcc -shared - TCL_CC = gcc --TCL_PACKAGE_PATH = /usr/local/tcl/8.0/lib ++TCL_SHLIB_CFLAGS = ++TCL_SHLIB_LD = ${SHLIBTOOL} --mode=link ${CC} ++TCL_CC = ${SHLIBTOOL} --mode=compile ${CC} +TCL_PACKAGE_PATH = ${PREFIX}/lib/tcl -@@ -68,35 +68,23 @@ CC= $(TCL_CC) +@@ -64,39 +64,27 @@ FILEMAP_OBJ=expat/xmlwf/unixfilemap.o + # You shouldnt have to edit anything below here + #---------------------------------------------------------------------------- + +-CC= $(TCL_CC) LIB= tclexpat$(TCL_SHLIB_SUFFIX) @@ -41,7 +48,7 @@ $NetBSD: patch-aa,v 1.3 2004/03/09 01:16:59 minskim Exp $ -${OBJS}: - cd expat ; make CC=${CC} SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS} +$(LIB): tclexpat.o -+ $(TCL_SHLIB_LD) -o $(LIB) $(OBJS) tclexpat.o -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lexpat -ltcl84 ++ $(TCL_SHLIB_LD) -o ${LIB:.so=.la} ${OBJS:.o=.lo} tclexpat.lo -L${LOCALBASE}/lib -rpath ${PREFIX}/lib -lexpat -ltcl84 -module -avoid-version tclexpat.o: tclexpat.c - $(TCL_CC) $(CFLAGS) -c $(TCL_DEFS) $(TCL_SHLIB_CFLAGS) -I$(TCL_PREFIX)/include -Iexpat/xmlparse tclexpat.c @@ -49,10 +56,13 @@ $NetBSD: patch-aa,v 1.3 2004/03/09 01:16:59 minskim Exp $ install: $(LIB) instdir=`echo $(TCL_PACKAGE_PATH) | cut -f 1 -d :` ; \ - mkdir $$instdir/TclExpat-$(TCLEXPAT_VERSION) ; \ +- mkdir $$instdir/TclExpat-$(TCLEXPAT_VERSION) ; \ - cp $(LIB) pkgIndex.tcl $$instdir -+ cp $(LIB) pkgIndex.tcl $$instdir/TclExpat-${TCLEXPAT_VERSION} - +- ++ ${BSD_INSTALL_DATA_DIR} $$instdir/TclExpat-$(TCLEXPAT_VERSION) ; \ ++ ${SHLIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${LIB:.so=.la} $$instdir/TclExpat-${TCLEXPAT_VERSION}; \ ++ ${SHLIBTOOL} --mode=finish $$instdir/TclExpat-${TCLEXPAT_VERSION}; \ ++ ${BSD_INSTALL_DATA} pkgIndex.tcl $$instdir/TclExpat-${TCLEXPAT_VERSION} clean: - @cd expat; make clean |