diff options
| -rw-r--r-- | cad/qcad/Makefile | 8 | ||||
| -rw-r--r-- | cad/qcad/distinfo | 4 | ||||
| -rw-r--r-- | cad/qcad/patches/patch-aa | 4 | ||||
| -rw-r--r-- | cad/vipec/Makefile | 15 | ||||
| -rw-r--r-- | games/kulki/Makefile | 8 | ||||
| -rw-r--r-- | games/kulki/distinfo | 4 | ||||
| -rw-r--r-- | games/kulki/patches/patch-aa | 4 | ||||
| -rw-r--r-- | games/nethack-lib/Makefile | 3 |
8 files changed, 26 insertions, 24 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 8f7fe785847..75a1d9945eb 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:40 fredb Exp $ +# $NetBSD: Makefile,v 1.9 2002/09/20 21:17:13 jlam Exp $ DISTNAME= qcad-1.4.7-src PKGNAME= qcad-1.4.7 @@ -10,7 +10,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.qcad.org/ COMMENT= 2D CAD System -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined +USE_X11= # defined do-configure: @for f in rappwin.cpp rconfig.cpp relement.cpp rfile.cpp \ @@ -34,6 +35,5 @@ do-install: TODO cur doc examples fonts hatches libraries messages xpm) | \ (cd ${PREFIX}/share/qcad; ${GTAR} vxf - ) -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/qt2-libs/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo index e34cbf78dba..ec3f5dacfb7 100644 --- a/cad/qcad/distinfo +++ b/cad/qcad/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2001/08/29 22:41:05 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/09/20 21:17:13 jlam Exp $ SHA1 (qcad-1.4.7-src.tar.gz) = a84d6ab41c8ce5ff114f01594c5d8378b01eff48 Size (qcad-1.4.7-src.tar.gz) = 1511955 bytes -SHA1 (patch-aa) = 46d4350760f96e4da7854a48d81d0d69d9776436 +SHA1 (patch-aa) = f066d56f80c1875a1d792fce677f06560f1af507 SHA1 (patch-ab) = cea24c43b1d9187f8b55c2c831e26ac8d7a6efe7 SHA1 (patch-ac) = 4e0dc2d55c9f3cb5a612c60699772bee0d9c82f0 SHA1 (patch-ad) = 0961a104cfa006e5c08682aa45f08e1206f41308 diff --git a/cad/qcad/patches/patch-aa b/cad/qcad/patches/patch-aa index c1f40d6a4fe..5831e6d60d1 100644 --- a/cad/qcad/patches/patch-aa +++ b/cad/qcad/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:06 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2002/09/20 21:17:14 jlam Exp $ --- Makefile.orig Sun Mar 25 06:17:10 2001 +++ Makefile @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.3 2001/08/29 22:41:06 jlam Exp $ -MOC = moc +LINK = $(CXX) +LFLAGS = ${LDFLAGS} -+LIBS = -L$(QTDIR)/lib -lqt -L${BUILDLINK_X11_DIR}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg ++LIBS = -L$(QTDIR)/lib -lqt -L${X11BASE}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg +MOC = $(QTDIR)/bin/moc ####### Files diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile index 2b74350e95c..80b8376bed0 100644 --- a/cad/vipec/Makefile +++ b/cad/vipec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2002/03/13 17:36:40 fredb Exp $ +# $NetBSD: Makefile,v 1.28 2002/09/20 21:13:39 jlam Exp $ # DISTNAME= vipec-2.0.4 @@ -10,13 +10,15 @@ MAINTAINER= dmcmahill@netbsd.org HOMEPAGE= http://www.netfold.com/~vipec/ COMMENT= Network analyser for electrical networks +USE_BUILDLINK2= yes +USE_X11= yes + GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-qt-dir=${QTDIR} +CONFIGURE_ENV+= USER_LDFLAGS="${LDFLAGS}" + USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -USE_BUILDLINK_ONLY= yes - -CONFIGURE_ARGS+= --with-qt-dir=${BUILDLINK_QTDIR} -CONFIGURE_ENV+= USER_LDFLAGS="${LDFLAGS}" post-patch: ${MV} -f ${WRKSRC}/vipec/helpwindow.cpp ${WRKSRC}/vipec/helpwindow.cpp.in @@ -35,6 +37,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.html ${PREFIX}/share/doc/vipec/models ${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.png ${PREFIX}/share/doc/vipec/models -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/qt2-libs/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/kulki/Makefile b/games/kulki/Makefile index 7217cb3f333..1f87c11e1ed 100644 --- a/games/kulki/Makefile +++ b/games/kulki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/03/13 17:37:01 fredb Exp $ +# $NetBSD: Makefile,v 1.12 2002/09/20 21:19:26 jlam Exp $ # DISTNAME= kulki-1.01 @@ -13,7 +13,8 @@ COMMENT= Simple logic game - "balls" WRKSRC= ${WRKDIR}/kulki -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES USE_GMAKE= YES MAKE_ENV+= CXX="${CXX}" @@ -30,6 +31,5 @@ do-install: cd ${PREFIX}/share/kulki && \ ( ${GUNZIP_CMD} -c ${WRKSRC}/images.tgz | ${GTAR} xf - ) -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/qt2-libs/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/kulki/distinfo b/games/kulki/distinfo index e2bfea8e609..1060c857502 100644 --- a/games/kulki/distinfo +++ b/games/kulki/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2001/08/29 22:41:11 jlam Exp $ +$NetBSD: distinfo,v 1.7 2002/09/20 21:19:27 jlam Exp $ SHA1 (kulki-1.01.tgz) = 20f14bdbde44dc56d914e4451ae33824f30abaf1 Size (kulki-1.01.tgz) = 1190074 bytes -SHA1 (patch-aa) = 97dd61393d4617f20a9dd2f20a6534710e208c46 +SHA1 (patch-aa) = 27a971b6be1059d258c49663c123e46c748cbc38 diff --git a/games/kulki/patches/patch-aa b/games/kulki/patches/patch-aa index e5830506af1..8413b506ae0 100644 --- a/games/kulki/patches/patch-aa +++ b/games/kulki/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.6 2001/08/29 22:41:11 jlam Exp $ +$NetBSD: patch-aa,v 1.7 2002/09/20 21:19:27 jlam Exp $ --- Makefile.orig Thu Feb 8 13:27:43 2001 +++ Makefile @@ -1,8 +1,8 @@ DEBUG = #-g -GLIBS = -L/usr/X11/lib \ -+GLIBS = -L${BUILDLINK_X11_DIR}/lib \ ++GLIBS = -L${X11BASE}/lib \ -I$(QTDIR)/include -L$(QTDIR)/lib\ -lqt -lX11 -lXext -INSTALL = /usr/games/ diff --git a/games/nethack-lib/Makefile b/games/nethack-lib/Makefile index d918dda88b9..3660268e514 100644 --- a/games/nethack-lib/Makefile +++ b/games/nethack-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/03/31 13:39:33 zuntum Exp $ +# $NetBSD: Makefile,v 1.13 2002/09/20 21:20:03 jlam Exp $ # .include "../nethack-lib/Makefile.common" @@ -7,6 +7,7 @@ PKGNAME= nethack-lib-${NETHACK_VERSION} COMMENT= data files for Nethack +USE_BUILDLINK2= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./sys/unix/setup.sh ALL_TARGET= datastuff |