diff options
| -rw-r--r-- | cad/felt/Makefile | 12 | ||||
| -rw-r--r-- | cad/felt/distinfo | 4 | ||||
| -rw-r--r-- | cad/felt/patches/patch-aa | 6 | ||||
| -rw-r--r-- | cad/ng-spice/Makefile | 10 | ||||
| -rw-r--r-- | print/cjk-lyx/Makefile | 25 |
5 files changed, 27 insertions, 30 deletions
diff --git a/cad/felt/Makefile b/cad/felt/Makefile index 71638db77a4..d71a768d462 100644 --- a/cad/felt/Makefile +++ b/cad/felt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/06/28 07:31:36 agc Exp $ +# $NetBSD: Makefile,v 1.19 2002/09/21 06:31:42 jlam Exp $ DISTNAME= felt-3.05.src PKGNAME= felt-3.05 @@ -13,6 +13,7 @@ COMMENT= Free system for introductory level finite element analysis EXTRACT_ONLY= felt-3.05.src.tar.gz WRKSRC= ${WRKDIR}/FElt-3.05 +USE_BUILDLINK2= # defined USE_X11BASE= # defined XAW_TYPE?= 3d @@ -20,11 +21,8 @@ MAKE_ENV+= CCOPTS="${CFLAGS}" MAKE_ENV+= LDOPTS="${LDFLAGS}" MAKE_ENV+= SH="${SH}" -USE_BUILDLINK_ONLY= # defined USE_GNU_READLINE= # uses remove_history() and history_list() -.include "../../mk/bsd.prefs.mk" - post-extract: @${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps @@ -36,7 +34,7 @@ post-install: COPYING CHANGELOG TODO ${PREFIX}/share/doc/felt ${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/felt -.include "../../devel/readline/buildlink.mk" -.include "../../mk/xaw.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/readline/buildlink2.mk" +.include "../../mk/xaw.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/cad/felt/distinfo b/cad/felt/distinfo index 328c450c426..1a25ad72fd3 100644 --- a/cad/felt/distinfo +++ b/cad/felt/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2001/08/29 22:41:05 jlam Exp $ +$NetBSD: distinfo,v 1.8 2002/09/21 06:31:43 jlam Exp $ SHA1 (felt-3.05.src.tar.gz) = da3e1ced626cc1c65a570d3e6e242252c039c28b Size (felt-3.05.src.tar.gz) = 956901 bytes SHA1 (felt-3.05.ps.gz) = 10fbac9927fe20cec3884d989204fe1a92d61784 Size (felt-3.05.ps.gz) = 626985 bytes -SHA1 (patch-aa) = d04579e0f1801341391a551ae797358089cff91a +SHA1 (patch-aa) = fbf4c14dec40fc1e5aa5009625c6465bc8d763ab SHA1 (patch-ab) = 60feea9b0b0af2b71b2a8780227eccbd223b12c5 diff --git a/cad/felt/patches/patch-aa b/cad/felt/patches/patch-aa index 60d5024d3b3..8fbeb35084d 100644 --- a/cad/felt/patches/patch-aa +++ b/cad/felt/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2001/08/29 22:41:05 jlam Exp $ +$NetBSD: patch-aa,v 1.7 2002/09/21 06:31:43 jlam Exp $ --- etc/Makefile.conf.orig Sat Mar 4 20:37:06 2000 +++ etc/Makefile.conf Tue May 22 12:21:18 2001 @@ -42,5 +42,5 @@ $NetBSD: patch-aa,v 1.6 2001/08/29 22:41:05 jlam Exp $ -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib +X11DEF = ${PREFIX}/lib/X11/app-defaults -+X11INC = ${BUILDLINK_X11_DIR}/include -+X11LIB = ${BUILDLINK_X11_DIR}/lib ++X11INC = ${X11BASE}/include ++X11LIB = ${X11BASE}/lib diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile index 0eaeed477af..38514f74c16 100644 --- a/cad/ng-spice/Makefile +++ b/cad/ng-spice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/02/18 15:14:03 seb Exp $ +# $NetBSD: Makefile,v 1.12 2002/09/21 06:31:30 jlam Exp $ # DISTNAME= ng-spice-rework-14 @@ -10,6 +10,8 @@ MAINTAINER= dmcmahill@netbsd.org HOMEPAGE= http://ngspice.sourceforge.net COMMENT= Next generation circuit simulation program +USE_BUILDLINK2= YES +USE_X11= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig @@ -17,10 +19,8 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-debug LIBS+= ${LIBGETOPT} -USE_BUILDLINK_ONLY= YES +.include "../../devel/libgetopt/buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" -.include "../../devel/libgetopt/buildlink.mk" -.include "../../devel/ncurses/buildlink.mk" -.include "../../mk/x11.buildlink.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile index b74df64bfac..923ef3f7569 100644 --- a/print/cjk-lyx/Makefile +++ b/print/cjk-lyx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/07/19 12:32:32 agc Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 06:30:45 jlam Exp $ DISTNAME= lyx-${LYX_VERS} PKGNAME= cjk-${DISTNAME} @@ -17,7 +17,7 @@ COMMENT= multibyte version of LyX LYX_VERS= 1.2.0 -CONFLICTS= lyx-* +CONFLICTS= lyx-[0-9]* DEPENDS+= ispell-base-[0-9]*:../../textproc/ispell-base DEPENDS+= teTeX-bin>=1.0.7nb1:../../print/teTeX-bin @@ -28,17 +28,16 @@ GCC_VERSION!= gcc --version .include "../../lang/gcc/Makefile.gcc" .endif -USE_PERL5= yes -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltmain.sh -GNU_CONFIGURE= yes +USE_BUILDLINK2= yes +USE_PERL5= yes +GNU_CONFIGURE= yes -post-configure: - # this pkg generates libtool script from configure file - cd ${WRKSRC} && config/ltmain.sh +USE_LIBTOOL= yes +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +LIBTOOL_OVERRIDE+= ${WRKSRC}/sigc++/libtool + +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../x11/xforms/buildlink2.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../x11/xforms/buildlink.mk" -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |