diff options
| -rw-r--r-- | devel/pvs/Makefile | 6 | ||||
| -rw-r--r-- | graphics/magicpoint/Makefile | 19 | ||||
| -rw-r--r-- | graphics/scigraphica/Makefile | 18 | ||||
| -rw-r--r-- | textproc/subtitleripper/Makefile | 8 | ||||
| -rw-r--r-- | textproc/subtitleripper/distinfo | 4 | ||||
| -rw-r--r-- | textproc/subtitleripper/patches/patch-aa | 13 |
6 files changed, 38 insertions, 30 deletions
diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile index fdf0524e0df..93470dc2311 100644 --- a/devel/pvs/Makefile +++ b/devel/pvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/03/26 02:27:38 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2004/05/09 20:19:44 snj Exp $ # DISTNAME= pvs-${VERSION} @@ -24,7 +24,7 @@ VERSION= 3.1 NO_BUILD= # defined CHECK_SHLIBS= NO SHLIB_HANDLING= NO -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES INFO_DIR= pvs/doc/release-notes INFO_FILES= pvs-release-notes.info @@ -63,6 +63,6 @@ do-install: cd ${WRKSRC} && ${PAX} -s ,^./[.].*,, -rw . ${PREFIX}/pvs ${CHMOD} 755 ${PREFIX}/pvs/pvs -.include "../../x11/tk83/buildlink2.mk" +.include "../../x11/tk83/buildlink3.mk" .include "../../mk/emacs.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile index 3a200f025c9..6656c6d5c06 100644 --- a/graphics/magicpoint/Makefile +++ b/graphics/magicpoint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2004/01/12 15:19:28 wennmach Exp $ +# $NetBSD: Makefile,v 1.38 2004/05/09 20:19:44 snj Exp $ DISTNAME= magicpoint-1.10a PKGREVISION= 2 @@ -11,8 +11,8 @@ COMMENT= X11 based presentation tool CONFLICTS= mgp-[0-9]* -USE_BUILDLINK2= yes GNU_CONFIGURE= yes +USE_BUILDLINK3= yes USE_IMAKE= yes USE_PERL5= build @@ -20,6 +20,7 @@ CONFIGURE_ARGS+= --enable-freetype-charset16 CONFIGURE_ARGS+= --disable-vflib CONFIGURE_ARGS+= --enable-locale CONFIGURE_ARGS+= --enable-gif +CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR} # We need to perform the steps normally done by ``xmkmf -a'' since some # files need to be created before ``make depend''. @@ -46,11 +47,11 @@ post-install: ${INSTALL_DATA} README* *.jpg *.eps *.mgp *.xbm mgprc-sample \ ${PREFIX}/share/examples/mgp -.include "../../fonts/Xft2/buildlink2.mk" -.include "../../fonts/fontconfig/buildlink2.mk" -.include "../../graphics/freetype2/buildlink2.mk" -.include "../../graphics/libungif/buildlink2.mk" -.include "../../graphics/mng/buildlink2.mk" -.include "../../graphics/netpbm/buildlink2.mk" -.include "../../graphics/png/buildlink2.mk" +.include "../../fonts/Xft2/buildlink3.mk" +.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/libungif/buildlink3.mk" +.include "../../graphics/mng/buildlink3.mk" +.include "../../graphics/netpbm/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile index 24fcbe5b092..0eddbfc7e36 100644 --- a/graphics/scigraphica/Makefile +++ b/graphics/scigraphica/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/04/14 16:15:24 jmmv Exp $ +# $NetBSD: Makefile,v 1.24 2004/05/09 20:19:44 snj Exp $ # DISTNAME= scigraphica-0.8.0 @@ -10,7 +10,7 @@ MAINTAINER= drochner@NetBSD.org HOMEPAGE= http://scigraphica.sourceforge.net/ COMMENT= Data analysis and technical graphics -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_DIRS+= gnome1-1.5 USE_X11= YES USE_GNU_TOOLS+= make @@ -23,15 +23,17 @@ CONFIGURE_ENV+= PYTHONBIN=${PYTHONBIN} USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +BUILDLINK_TRANSFORM+= L:-L: + PY_PATCHPLIST= YES .include "../../lang/python/application.mk" -.include "../../devel/readline/buildlink2.mk" -.include "../../graphics/imlib/buildlink2.mk" -.include "../../math/py-Numeric/buildlink2.mk" -.include "../../textproc/libxml/buildlink2.mk" -.include "../../x11/gtk/buildlink2.mk" -.include "../../x11/gtk+extra/buildlink2.mk" +.include "../../devel/readline/buildlink3.mk" +.include "../../graphics/imlib/buildlink3.mk" +.include "../../math/py-Numeric/buildlink3.mk" +.include "../../textproc/libxml/buildlink3.mk" +.include "../../x11/gtk/buildlink3.mk" +.include "../../x11/gtk+extra/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/subtitleripper/Makefile b/textproc/subtitleripper/Makefile index 4012fee3cd0..bc1a7c049f0 100644 --- a/textproc/subtitleripper/Makefile +++ b/textproc/subtitleripper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/24 15:13:20 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/05/09 20:19:44 snj Exp $ # DISTNAME= subtitleripper-0.3-1 @@ -13,9 +13,9 @@ COMMENT= Sub title ripping program DEPENDS+= gocr-[0-9]*:../../textproc/gocr -WRKSRC= ${WRKDIR}/subtitleripper -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_GNU_TOOLS+= make +WRKSRC= ${WRKDIR}/subtitleripper do-install: ${INSTALL_SCRIPT} ${WRKSRC}/pgm2txt ${PREFIX}/bin @@ -28,5 +28,5 @@ do-install: gocrfilter_fr.sed gocrfilter_nl.sed gocrfilter_none.sed \ ${LOCALBASE}/share/doc/subtitleripper -.include "../../graphics/netpbm/buildlink2.mk" +.include "../../graphics/netpbm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/subtitleripper/distinfo b/textproc/subtitleripper/distinfo index 294941c641a..a71a53aea4f 100644 --- a/textproc/subtitleripper/distinfo +++ b/textproc/subtitleripper/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/06/23 07:20:54 mrg Exp $ +$NetBSD: distinfo,v 1.2 2004/05/09 20:19:44 snj Exp $ SHA1 (subtitleripper-0.3-1.tgz) = d34aac07e834fd462c89484db8fcb27bebcb8ef5 Size (subtitleripper-0.3-1.tgz) = 42382 bytes -SHA1 (patch-aa) = c4db981ea9591e2be215637521486f8d977bedd8 +SHA1 (patch-aa) = b93e8276813bb6bf2a3aee797619bd1bff0f7eca diff --git a/textproc/subtitleripper/patches/patch-aa b/textproc/subtitleripper/patches/patch-aa index cb9d887343f..30c0a01b354 100644 --- a/textproc/subtitleripper/patches/patch-aa +++ b/textproc/subtitleripper/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/06/23 07:20:55 mrg Exp $ +$NetBSD: patch-aa,v 1.2 2004/05/09 20:19:44 snj Exp $ ---- Makefile.orig 2003-06-21 05:16:27.000000000 +1000 -+++ Makefile 2003-06-21 05:18:45.000000000 +1000 -@@ -4,8 +4,8 @@ +--- Makefile.orig 2003-02-24 03:44:11.000000000 -0800 ++++ Makefile 2004-05-09 11:20:50.000000000 -0700 +@@ -4,12 +4,12 @@ # use always: DEFINES := @@ -13,3 +13,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/06/23 07:20:55 mrg Exp $ ### enable ppm support ### DEFINES += -D_HAVE_LIB_PPM_ +-LIBS += -lppm ++LIBS += -lnetpbm ${LDFLAGS} + + ### enable zlib support ### + DEFINES += -D_HAVE_ZLIB_ |