diff options
author | jlam <jlam> | 2002-09-21 00:24:03 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-09-21 00:24:03 +0000 |
commit | 884b8373f860500b3d3b0afd634108525ceecdaa (patch) | |
tree | 475eed0a77cefb132c6b358d9f338fb7535a9125 /x11/xforms | |
parent | f2f487d7a6de6996e81c0a2f84f89dfe3ab88ffc (diff) | |
download | pkgsrc-884b8373f860500b3d3b0afd634108525ceecdaa.tar.gz |
buildlink1 -> buildlink2
Diffstat (limited to 'x11/xforms')
-rw-r--r-- | x11/xforms/Makefile | 12 | ||||
-rw-r--r-- | x11/xforms/distinfo | 10 | ||||
-rw-r--r-- | x11/xforms/patches/patch-ab | 6 | ||||
-rw-r--r-- | x11/xforms/patches/patch-ac | 6 | ||||
-rw-r--r-- | x11/xforms/patches/patch-ad | 6 | ||||
-rw-r--r-- | x11/xforms/patches/patch-ae | 4 |
6 files changed, 23 insertions, 21 deletions
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile index a6bf5e28f1e..bed78a5695b 100644 --- a/x11/xforms/Makefile +++ b/x11/xforms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2002/08/25 19:24:01 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2002/09/21 00:24:03 jlam Exp $ # DISTNAME= xforms-0.9999 @@ -10,12 +10,14 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://world.std.com/~xforms/ COMMENT= Graphical user interface toolkit for X Window System +USE_BUILDLINK2= YES USE_IMAKE= YES USE_X11= YES -MAKE_ENV= DEPEND_DEFINES="-I${BUILDLINK_DIR}/include" -SCRIPTS_ENV= DEPEND_DEFINES="-I${BUILDLINK_DIR}/include" +MAKE_ENV= DEPEND_DEFINES="${CPPFLAGS}" +SCRIPTS_ENV= DEPEND_DEFINES="${CPPFLAGS}" + +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xforms/distinfo b/x11/xforms/distinfo index 241b47b8d96..233a75b8074 100644 --- a/x11/xforms/distinfo +++ b/x11/xforms/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2002/08/25 19:24:01 jlam Exp $ +$NetBSD: distinfo,v 1.11 2002/09/21 00:24:04 jlam Exp $ SHA1 (xforms-0.9999.tgz) = d88d24a37ab4fe37fbcb8b85f0c6a727638db217 Size (xforms-0.9999.tgz) = 1040128 bytes SHA1 (patch-aa) = c20083fc9f55986853c63726a9ad74e7bf233ef3 -SHA1 (patch-ab) = aac66bfb7a549fd6235d4c20feb3f957cdcc2821 -SHA1 (patch-ac) = f6795e4ca9c1887522fa7595ef502d169c28b9c6 -SHA1 (patch-ad) = f17516b9292be07794a7ac184c985be66ba88834 -SHA1 (patch-ae) = ccf27ff1e0c2f95a26f4b4365825ae7d511081f6 +SHA1 (patch-ab) = 1d5b440c88e2ea5915b050a28056cd4ad378996e +SHA1 (patch-ac) = 47de2d8cbec85a8e9509c667bfe814fd0103eede +SHA1 (patch-ad) = 964b6df86a0bd56f66073b2d121d7c12d0f89bdb +SHA1 (patch-ae) = a6c3847470591a8d7e219fa5b0390fa145092dd7 diff --git a/x11/xforms/patches/patch-ab b/x11/xforms/patches/patch-ab index e19a830450c..5374766b263 100644 --- a/x11/xforms/patches/patch-ab +++ b/x11/xforms/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2002/04/17 18:18:53 fredb Exp $ +$NetBSD: patch-ab,v 1.5 2002/09/21 00:24:04 jlam Exp $ --- demos/Imakefile.orig Mon Apr 1 10:56:26 2002 +++ demos/Imakefile @@ -8,7 +8,7 @@ $NetBSD: patch-ab,v 1.4 2002/04/17 18:18:53 fredb Exp $ -JPEGLIBLOC = /usr/local/lib +LDPRELIBS = -+JPEGLIBLOC = ${BUILDLINK_DIR}/lib ++JPEGLIBLOC = ${LOCALBASE}/lib +JPEGLIB = -L${JPEGLIBLOC} -ljpeg #if Solaris64Bit @@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.4 2002/04/17 18:18:53 fredb Exp $ -Ifd \ -I. \ - -I/usr/local/include \ -+ -I${BUILDLINK_DIR}/include \ ++ -I${LOCALBASE}/include \ /* Don't remove this line */ EXTRA_LIBRARIES = \ diff --git a/x11/xforms/patches/patch-ac b/x11/xforms/patches/patch-ac index 0f25899fe8e..2de624bb3ed 100644 --- a/x11/xforms/patches/patch-ac +++ b/x11/xforms/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2002/04/17 18:18:53 fredb Exp $ +$NetBSD: patch-ac,v 1.3 2002/09/21 00:24:04 jlam Exp $ --- fd2ps/Imakefile.orig Tue Apr 2 11:34:02 2002 +++ fd2ps/Imakefile @@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.2 2002/04/17 18:18:53 fredb Exp $ OBJS = $(SRCS:.c=.o) +LDPRELIBS = -+JPEGLIBLOC = ${BUILDLINK_DIR}/lib ++JPEGLIBLOC = ${LOCALBASE}/lib +JPEGLIB = -L${JPEGLIBLOC} -ljpeg + FORMSLIBDIR = $(TOP)/lib @@ -31,7 +31,7 @@ $NetBSD: patch-ac,v 1.2 2002/04/17 18:18:53 fredb Exp $ -Ixpm \ -I. \ - -I/usr/local/include \ -+ -I${BUILDLINK_DIR}/include \ ++ -I${LOCALBASE}/include \ /* Don't remove this line */ EXTRA_LIBRARIES = \ diff --git a/x11/xforms/patches/patch-ad b/x11/xforms/patches/patch-ad index 45fed6d9d96..78539cceca6 100644 --- a/x11/xforms/patches/patch-ad +++ b/x11/xforms/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.2 2002/04/17 18:18:53 fredb Exp $ +$NetBSD: patch-ad,v 1.3 2002/09/21 00:24:04 jlam Exp $ --- fdesign/Imakefile.orig Tue Apr 2 11:33:21 2002 +++ fdesign/Imakefile @@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.2 2002/04/17 18:18:53 fredb Exp $ OBJS = $(SRCS:.c=.o) +LDPRELIBS = -+JPEGLIBLOC = ${BUILDLINK_DIR}/lib ++JPEGLIBLOC = ${LOCALBASE}/lib +JPEGLIB = -L${JPEGLIBLOC} -ljpeg + #if Solaris64Bit @@ -36,7 +36,7 @@ $NetBSD: patch-ad,v 1.2 2002/04/17 18:18:53 fredb Exp $ -Ixpm \ -I. \ - -I/usr/local/include \ -+ -I${BUILDLINK_DIR}/include \ ++ -I${LOCALBASE}/include \ /* Don't remove this line */ EXTRA_LIBRARIES = \ diff --git a/x11/xforms/patches/patch-ae b/x11/xforms/patches/patch-ae index 79da8589d9c..3145d84484f 100644 --- a/x11/xforms/patches/patch-ae +++ b/x11/xforms/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1 2002/04/17 04:40:43 fredb Exp $ +$NetBSD: patch-ae,v 1.2 2002/09/21 00:24:05 jlam Exp $ --- lib/Imakefile.orig Tue Apr 2 11:27:04 2002 +++ lib/Imakefile @@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.1 2002/04/17 04:40:43 fredb Exp $ -I. \ -Ifd \ - -I/usr/local/include \ -+ -I${BUILDLINK_DIR}/include \ ++ -I${LOCALBASE}/include \ /* Do not remove this line */ EXTRA_DEFINES = \ |