diff options
| author | marino <marino@pkgsrc.org> | 2012-08-21 21:58:14 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-08-21 21:58:14 +0000 |
| commit | a795df978e8a160e7bdcd7d7de3202a6c8484621 (patch) | |
| tree | 469b4837e03c6a8d686eb66a3c5c871192080140 /textproc/tcl-expat | |
| parent | dba74c080c4f7d47fcb944eae7eb08e3bf48a060 (diff) | |
| download | pkgsrc-a795df978e8a160e7bdcd7d7de3202a6c8484621.tar.gz | |
textproc/tcl-expat: Patch in tcl 8.5 support
The tcl-expat makefile was previously hardcoded for ltcl84. Modify the
patch to hardcode it for ltcl85.
Diffstat (limited to 'textproc/tcl-expat')
| -rw-r--r-- | textproc/tcl-expat/Makefile | 4 | ||||
| -rw-r--r-- | textproc/tcl-expat/distinfo | 4 | ||||
| -rw-r--r-- | textproc/tcl-expat/patches/patch-aa | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/textproc/tcl-expat/Makefile b/textproc/tcl-expat/Makefile index 8f4c137c809..3f43ac292ae 100644 --- a/textproc/tcl-expat/Makefile +++ b/textproc/tcl-expat/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2009/08/20 15:25:00 jwise Exp $ +# $NetBSD: Makefile,v 1.13 2012/08/21 21:58:14 marino Exp $ # DISTNAME= TclExpat-1.1 PKGNAME= tcl-expat-1.1 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= textproc www tcl MASTER_SITES= http://www.zveno.com/in-tclxml/ diff --git a/textproc/tcl-expat/distinfo b/textproc/tcl-expat/distinfo index e5a0d0eb60e..a8d93aa334d 100644 --- a/textproc/tcl-expat/distinfo +++ b/textproc/tcl-expat/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2009/07/07 20:43:58 joerg Exp $ +$NetBSD: distinfo,v 1.7 2012/08/21 21:58:14 marino 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) = 23ed5a40be8336344bff9f7730804a172b9380aa +SHA1 (patch-aa) = 25310d22fee902214d45fd7a3c441bcfa216f8f8 SHA1 (patch-ab) = 9985adb007741c36182d093a18c210c0230ac566 diff --git a/textproc/tcl-expat/patches/patch-aa b/textproc/tcl-expat/patches/patch-aa index 59170f5d676..00a5007d195 100644 --- a/textproc/tcl-expat/patches/patch-aa +++ b/textproc/tcl-expat/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.5 2009/07/07 20:43:58 joerg Exp $ +$NetBSD: patch-aa,v 1.6 2012/08/21 21:58:14 marino Exp $ + +libtcl85 is hard-coded in the patch, just like it's predecessor. --- Makefile.orig 1998-08-25 07:25:20.000000000 +0000 +++ Makefile @@ -48,7 +50,7 @@ $NetBSD: patch-aa,v 1.5 2009/07/07 20:43:58 joerg Exp $ -${OBJS}: - cd expat ; make CC=${CC} SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS} +$(LIB): tclexpat.o -+ $(TCL_SHLIB_LD) -o ${LIB:.so=.la} ${OBJS:.o=.lo} tclexpat.lo -L${LOCALBASE}/lib -rpath ${PREFIX}/lib -lexpat -ltcl84 -module -avoid-version ++ $(TCL_SHLIB_LD) -o ${LIB:.so=.la} ${OBJS:.o=.lo} tclexpat.lo -L${LOCALBASE}/lib -rpath ${PREFIX}/lib -lexpat -ltcl85 -module -avoid-version tclexpat.o: tclexpat.c - $(TCL_CC) $(CFLAGS) -c $(TCL_DEFS) $(TCL_SHLIB_CFLAGS) -I$(TCL_PREFIX)/include -Iexpat/xmlparse tclexpat.c |