diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
| commit | 63fc151cb9f15f8bcc66bbeca21050fea30c29d3 (patch) | |
| tree | 0943c3791afa0b712d3818b69672014acfe55e03 /comms/estic | |
| parent | 70004632b203c88d357d29ec8f217d1caa85f9c7 (diff) | |
| download | pkgsrc-63fc151cb9f15f8bcc66bbeca21050fea30c29d3.tar.gz | |
Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links. These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.
Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
Diffstat (limited to 'comms/estic')
| -rw-r--r-- | comms/estic/Makefile | 4 | ||||
| -rw-r--r-- | comms/estic/distinfo | 4 | ||||
| -rw-r--r-- | comms/estic/patches/patch-ag | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/comms/estic/Makefile b/comms/estic/Makefile index 23d20596d51..3216d1519a4 100644 --- a/comms/estic/Makefile +++ b/comms/estic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/08/19 04:48:35 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:06 jlam Exp $ DISTNAME= estic-1.61 CATEGORIES= comms @@ -11,7 +11,6 @@ HOMEPAGE= http://www.von-bassewitz.de/uz/estic/estic.html COMMENT= German language configuration tool for ISTEC 1003/1008 ISDN systems EXTRACT_ONLY= estic-1.60-sources${EXTRACT_SUFX} -USE_X11= YES RESTRICTED= "Only free distribution permitted" NO_SRC_ON_CDROM=${RESTRICTED} @@ -44,4 +43,5 @@ do-install: cd ${WRKSRC}/samples && \ ${INSTALL_DATA} * ${PREFIX}/share/examples/estic +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/estic/distinfo b/comms/estic/distinfo index 3bc302d89a2..eba755bdf1b 100644 --- a/comms/estic/distinfo +++ b/comms/estic/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 09:04:18 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/08/29 22:41:06 jlam Exp $ SHA1 (estic-1.60-sources.zip) = ce66a6d52faaf6adba492bb3f74e49eab608d0c3 Size (estic-1.60-sources.zip) = 892311 bytes @@ -10,7 +10,7 @@ SHA1 (patch-ac) = 9fda10375f0b074473c47202c59f4f872b14ae87 SHA1 (patch-ad) = b7287df75abc237859ee25ce04c5b3df4d338c37 SHA1 (patch-ae) = 29ce3dafba535a26aef00e53da05d51eb09617be SHA1 (patch-af) = 39a39789e8875d901bce07581b544ef8590af4fa -SHA1 (patch-ag) = f12d7fe2bf40a420b8b045e52215cb844cae33e5 +SHA1 (patch-ag) = 6a2703a6839e4e75c0d3a40e9ffd8c6362b29ffc SHA1 (patch-ah) = 4a5ce78d5d7173132c91ec5dbcf20b0484afe882 SHA1 (patch-ai) = d7fdcc29f357a9a8b0790e2491f577160d05db34 SHA1 (patch-aj) = afaa7e22e01fc698418fb6543fe8e7f81feab106 diff --git a/comms/estic/patches/patch-ag b/comms/estic/patches/patch-ag index 5929c0306d0..ef7582f99c6 100644 --- a/comms/estic/patches/patch-ag +++ b/comms/estic/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ +$NetBSD: patch-ag,v 1.2 2001/08/29 22:41:06 jlam Exp $ --- ../spunk/make/freebsd-x.mak.orig Sun Nov 24 22:33:26 1996 +++ ../spunk/make/freebsd-x.mak Sat Feb 10 19:06:51 2001 @@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ # Flags for the gnu compiler -CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -x c++ -I /usr/X11R6/include -fno-implicit-templates -DEXPLICIT_TEMPLATES -+CFLAGS += -DFREEBSD -Wall -x c++ -I$(X11BASE)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES ++CFLAGS += -DFREEBSD -Wall -x c++ -I$(BUILDLINK_X11_DIR)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES LIB = spunk.a ZIPFILE = spunk.zip |