diff options
| -rw-r--r-- | editors/ted/Makefile | 14 | ||||
| -rw-r--r-- | www/mMosaic/Makefile | 12 | ||||
| -rw-r--r-- | www/mMosaic/distinfo | 4 | ||||
| -rw-r--r-- | www/mMosaic/patches/patch-aa | 10 |
4 files changed, 22 insertions, 18 deletions
diff --git a/editors/ted/Makefile b/editors/ted/Makefile index 21d2930f567..7432b9e96e7 100644 --- a/editors/ted/Makefile +++ b/editors/ted/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/04/21 23:19:54 markd Exp $ +# $NetBSD: Makefile,v 1.11 2002/10/08 12:48:55 jlam Exp $ DISTNAME= ted-2.11.src PKGNAME= ted-2.11 @@ -11,6 +11,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.nllgg.nl/Ted/ COMMENT= X11 based WordPad-like word processor +USE_BUILDLINK2= YES USE_X11BASE= YES AFMDIR= ${PREFIX}/share/Ted/afm @@ -59,9 +60,10 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/Ted/TedDocument-en_US.rtf ${INFODIR} ${INSTALL_DATA} ${WRKSRC}/Ted/Ted.ad ${PREFIX}/lib/X11/app-defaults/Ted -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/motif.buildlink.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../mk/motif.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile index ccf8db30f5d..aca1a820428 100644 --- a/www/mMosaic/Makefile +++ b/www/mMosaic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/08/20 00:39:54 fredb Exp $ +# $NetBSD: Makefile,v 1.2 2002/10/08 12:43:24 jlam Exp $ # DISTNAME= mMosaic-3.7.2 @@ -11,13 +11,15 @@ COMMENT= Modern derivative of NCSA XMosaic WRKSRC= ${WRKDIR}/mMosaic-src-3.7.2 +USE_BUILDLINK2= YES USE_X11= YES do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mMosaic ${PREFIX}/bin/ -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../mk/motif.buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../mk/motif.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/mMosaic/distinfo b/www/mMosaic/distinfo index 85112f7bc31..16802b0a365 100644 --- a/www/mMosaic/distinfo +++ b/www/mMosaic/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/08/20 00:39:54 fredb Exp $ +$NetBSD: distinfo,v 1.2 2002/10/08 12:43:24 jlam Exp $ SHA1 (mMosaic-3.7.2.tar.gz) = f26d4fd115a0fb7fc09947506b59e1a3790b6ac7 Size (mMosaic-3.7.2.tar.gz) = 507612 bytes -SHA1 (patch-aa) = 3e6ed2dd31bc4d560cd0d1eca4d118d8ad0438b7 +SHA1 (patch-aa) = 9e0eb8ef665dfd8ad02947fea3274979355cbe0c SHA1 (patch-ab) = 64cb25fda5e4100251072184dec9f50e8de4be97 SHA1 (patch-ac) = 98479482a48a19b3f64ce4ed7a33cec04c90d070 SHA1 (patch-ad) = d0da529ed866a9295010419882a004997bba17a7 diff --git a/www/mMosaic/patches/patch-aa b/www/mMosaic/patches/patch-aa index e81824df7c4..0ec0568274d 100644 --- a/www/mMosaic/patches/patch-aa +++ b/www/mMosaic/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/08/20 00:39:55 fredb Exp $ +$NetBSD: patch-aa,v 1.2 2002/10/08 12:43:25 jlam Exp $ --- Makefile.orig Thu Feb 1 07:27:30 2001 +++ Makefile @@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/20 00:39:55 fredb Exp $ #solaris8 -xinc = -I/usr/openwin/include -I/usr/dt/include -DMOTIF12_HEADERS +#xinc = -I/usr/openwin/include -I/usr/dt/include -DMOTIF12_HEADERS -+xinc = -I${BUILDLINK_DIR}/include -I${X11BASE}/include ++xinc = -I${LOCALBASE}/include -I${X11BASE}/include ## @@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/20 00:39:55 fredb Exp $ #xlibs += -lXm -lXmu -lXt -lXext -lX11 -lm -xlibs += -lXm12 -lXmu -lXt -lXext -lX11 -lm +#xlibs += -lXm12 -lXmu -lXt -lXext -lX11 -lm -+xlibs = -L${X11BASE}/lib -L${BUILDLINK_DIR}/lib ++xlibs = -L${X11BASE}/lib -L${LOCALBASE}/lib +xlibs += -lXm -lXmu -lXt -lXext -lX11 -lm +xlibs += -Wl,-rpath,${X11PREFIX}/lib @@ -86,7 +86,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/20 00:39:55 fredb Exp $ -pnglibs = /usr/local/lib/libpng.a /usr/local/lib/libz.a +#pnginc = /usr/local/include +#pnglibs = /usr/local/lib/libpng.a /usr/local/lib/libz.a -+pnginc = ${BUILDLINK_DIR}/include ++pnginc = ${LOCALBASE}/include +pnglibs = -lpng -lz -Wl,-rpath,${LOCALBASE}/lib # To disable PNG support comment this. @@ -99,7 +99,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/20 00:39:55 fredb Exp $ -jpeglibs = /usr/local/lib/libjpeg.a +#jpeginc = /usr/local/include +#jpeglibs = /usr/local/lib/libjpeg.a -+jpeginc = ${BUILDLINK_DIR}/include ++jpeginc = ${LOCALBASE}/include +jpeglibs = -ljpeg -Wl,-rpath,${LOCALBASE}/lib # To disable JPEG support (not recommended) comment this. |