diff options
-rw-r--r-- | cad/qcad/Makefile | 17 | ||||
-rw-r--r-- | cad/qcad/distinfo | 4 | ||||
-rw-r--r-- | cad/qcad/patches/patch-aa | 19 | ||||
-rw-r--r-- | cad/vipec/Makefile | 20 | ||||
-rw-r--r-- | cad/vipec/distinfo | 4 | ||||
-rw-r--r-- | cad/vipec/patches/patch-aa | 23 | ||||
-rw-r--r-- | x11/ebuilder/Makefile | 16 | ||||
-rw-r--r-- | x11/ebuilder/distinfo | 5 | ||||
-rw-r--r-- | x11/ebuilder/patches/patch-aa | 21 | ||||
-rw-r--r-- | x11/ebuilder/patches/patch-ab | 13 | ||||
-rw-r--r-- | x11/qwt/Makefile | 11 | ||||
-rw-r--r-- | x11/qwt/distinfo | 4 | ||||
-rw-r--r-- | x11/qwt/patches/patch-aa | 4 |
13 files changed, 70 insertions, 91 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index d4a706a2a6c..70dc6f10a49 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/05/03 22:02:59 jtb Exp $ +# $NetBSD: Makefile,v 1.4 2001/06/26 20:10:22 jlam Exp $ DISTNAME= qcad-1.4.7-src PKGNAME= qcad-1.4.7 @@ -9,18 +9,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.qcad.org/ COMMENT= 2D CAD System -DEPENDS+= qt2-libs>=2.2.4:../../x11/qt2-libs - -USE_X11= #defined - -EVAL_PREFIX+= QT2_PREFIX=qt2 -MAKE_ENV+= QTDIR=${QT2_PREFIX}/qt2 - -JPEG_PREFIX_DEFAULT= ${LOCALBASE} -EVAL_PREFIX+= JPEG_PREFIX=jpeg - -PNG_PREFIX_DEFAULT= ${LOCALBASE} -EVAL_PREFIX+= PNG_PREFIX=png +USE_BUILDLINK_ONLY= # defined +USE_X11= # defined do-configure: @for f in rappwin.cpp rconfig.cpp relement.cpp rfile.cpp \ @@ -44,4 +34,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/bsd.pkg.mk" diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo index ed08398117f..33b65b20efa 100644 --- a/cad/qcad/distinfo +++ b/cad/qcad/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 16:27:01 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/06/26 20:10:23 jlam Exp $ SHA1 (qcad-1.4.7-src.tar.gz) = a84d6ab41c8ce5ff114f01594c5d8378b01eff48 Size (qcad-1.4.7-src.tar.gz) = 1511955 bytes -SHA1 (patch-aa) = c95cb47e57ad4bd617ffca3f9c2b76cb4e6b5f76 +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 e9d0e329788..56b85db8817 100644 --- a/cad/qcad/patches/patch-aa +++ b/cad/qcad/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/03/26 20:53:53 jtb Exp $ +$NetBSD: patch-aa,v 1.2 2001/06/26 20:10:23 jlam Exp $ ---- Makefile.orig Sun Mar 25 11:17:10 2001 +--- Makefile.orig Sun Mar 25 06:17:10 2001 +++ Makefile @@ -7,13 +7,14 @@ @@ -17,9 +17,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/26 20:53:53 jtb Exp $ -LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11 -MOC = moc +LINK = $(CXX) -+#LFLAGS = -static -+LIBS = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -lqt -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -Wl,-R${PNG_PREFIX}/lib -L${PNG_PREFIX}/lib -lpng -lz -Wl,-R${JPEG_PREFIX}/lib -L${JPEG_PREFIX}/lib -ljpeg -+MOC = ${QTDIR}/bin/moc ++LFLAGS = ${LDFLAGS} ++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 @@ -40,12 +40,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/26 20:53:53 jtb Exp $ .C.o: $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -@@ -386,7 +387,7 @@ - all: $(TARGET) - - $(TARGET): $(OBJECTS) $(OBJMOC) -- $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) -+ $(LINK) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) - - moc: $(SRCMOC) - diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile index 29d5a9c8c75..b777128a43a 100644 --- a/cad/vipec/Makefile +++ b/cad/vipec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/06/11 06:34:20 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2001/06/26 20:26:16 jlam Exp $ # DISTNAME= vipec-2.0.4 @@ -9,19 +9,14 @@ MAINTAINER= dmcmahill@netbsd.org HOMEPAGE= http://www.netfold.com/~vipec/ COMMENT= Network analyser for electrical networks -DEPENDS+= qt2-libs-*:../../x11/qt2-libs - -GNU_CONFIGURE= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -USE_X11= yes +USE_X11= yes +USE_BUILDLINK_ONLY= yes -EVAL_PREFIX+= QT2DIR=qt2-libs -# make sure configure finds png -CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= "QTDIR=${QT2DIR}/qt2" \ - USER_LDFLAGS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" -CONFIGURE_ARGS+= "--with-qt-dir=${QT2DIR}/qt2" +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 @@ -40,4 +35,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/bsd.pkg.mk" diff --git a/cad/vipec/distinfo b/cad/vipec/distinfo index 2f6bf02f186..14572d27839 100644 --- a/cad/vipec/distinfo +++ b/cad/vipec/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 16:27:03 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/06/26 20:26:16 jlam Exp $ SHA1 (vipec-2.0.4.tar.gz) = 56e273d50fb9886fc25b91eb446da4812032508e Size (vipec-2.0.4.tar.gz) = 408479 bytes -SHA1 (patch-aa) = f66e8a97a5d99d472f0eaeff276c72659256842b +SHA1 (patch-aa) = 0e1640fc310770b49a91a3f1f15012102730d0d9 SHA1 (patch-ab) = 3a6b0783950fae7aa79ff4f913a719ce26a70d81 SHA1 (patch-ac) = e4ab38a8b41e9dfa83881f8b7fd50c01b76103ac diff --git a/cad/vipec/patches/patch-aa b/cad/vipec/patches/patch-aa index 365016d1059..585ef0a6285 100644 --- a/cad/vipec/patches/patch-aa +++ b/cad/vipec/patches/patch-aa @@ -1,14 +1,7 @@ -$NetBSD: patch-aa,v 1.7 2000/08/30 16:19:43 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.8 2001/06/26 20:26:16 jlam Exp $ --- configure.orig Mon May 22 14:34:07 2000 +++ configure Wed Aug 30 10:53:54 2000 -@@ -4214,5 +4214,5 @@ - x_libraries="/usr/lib"; else - x_libraries=$ac_x_libraries -- X_LDFLAGS="-L$x_libraries" -+ X_LDFLAGS="-L$x_libraries -Wl,-R$x_libraries" - fi - all_includes="$X_INCLUDES" @@ -4408,5 +4408,5 @@ echo "configure:4409: checking for Qt" >&5 @@ -16,13 +9,6 @@ $NetBSD: patch-aa,v 1.7 2000/08/30 16:19:43 dmcmahill Exp $ +LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET" ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO qt_libraries="" -@@ -4501,5 +4501,5 @@ - - CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" --LDFLAGS="-L$qt_libdir $all_libraries $USER_LDFLAGS" -+LDFLAGS="-L$qt_libdir -Wl,-R$qt_libdir $all_libraries $USER_LDFLAGS" - LIBS="$LIBS $LIBQT" - @@ -4631,5 +4631,5 @@ CXXFLAGS="$CXXFLAGS -I$qt_includes" LDFLAGS="$X_LDFLAGS" @@ -30,10 +16,3 @@ $NetBSD: patch-aa,v 1.7 2000/08/30 16:19:43 dmcmahill Exp $ +LIBS="-lqt -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET" LD_LIBRARY_PATH= export LD_LIBRARY_PATH -@@ -4737,5 +4737,5 @@ - QT_LDFLAGS="" - else -- QT_LDFLAGS="-L$qt_libraries" -+ QT_LDFLAGS="-L$qt_libraries -Wl,-R$qt_libraries" - all_libraries="$all_libraries $QT_LDFLAGS" - fi diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index 776443449ee..693ab7ba1c6 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/05/22 09:32:27 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2001/06/26 19:54:48 jlam Exp $ # DISTNAME= ebuilder-0.56d @@ -10,17 +10,15 @@ MAINTAINER= drochner@netbsd.org HOMEPAGE= http://web.inter.nl.net/users/eavdmeer/index.html COMMENT= GUI builder for the Qt library -DEPENDS+= qt2-libs-*:../../x11/qt2-libs -DEPENDS+= png>=1.0.11:../../graphics/png +USE_BUILDLINK_ONLY= yes +USE_X11= yes +USE_GMAKE= yes +MAKEFILE= GNUmakefile -USE_X11= yes -USE_GMAKE= yes -MAKEFILE= GNUmakefile - -EVAL_PREFIX+= QT2DIR=qt2-libs -MAKE_ENV= QTDIR=${QT2DIR}/qt2 +MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin +.include "../../x11/qt2-libs/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/ebuilder/distinfo b/x11/ebuilder/distinfo index 668b05953b9..da8e601e4a1 100644 --- a/x11/ebuilder/distinfo +++ b/x11/ebuilder/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:07:36 skrll Exp $ +$NetBSD: distinfo,v 1.3 2001/06/26 19:54:48 jlam Exp $ SHA1 (ebuilder-0.56d.tar.gz) = fb0c7d56a7c55580082a832be975d188fe0e5e5d Size (ebuilder-0.56d.tar.gz) = 84717 bytes -SHA1 (patch-aa) = 7f780af128ba34f7ed0a828c3c458a875d1342f0 +SHA1 (patch-aa) = 906ee4003691e821b386cdcd6ccdd56777f7872d +SHA1 (patch-ab) = a50121d2072e2c756432c4e0bfd44c6a2683498a diff --git a/x11/ebuilder/patches/patch-aa b/x11/ebuilder/patches/patch-aa index f706f7bb986..0c6d17addfb 100644 --- a/x11/ebuilder/patches/patch-aa +++ b/x11/ebuilder/patches/patch-aa @@ -1,15 +1,24 @@ -$NetBSD: patch-aa,v 1.2 2000/10/19 07:57:18 skrll Exp $ +$NetBSD: patch-aa,v 1.3 2001/06/26 19:54:49 jlam Exp $ ---- config.mk.orig Sat Mar 25 13:31:45 2000 +--- config.mk.orig Sat Mar 25 08:31:45 2000 +++ config.mk -@@ -12,7 +12,9 @@ +@@ -1,8 +1,8 @@ + # Your very own favorite C++ compiler +-CXX = g++ ++#CXX = g++ + + # Additional compiler flags for compiling for debugging/optimization +-DEBUG = -g ++#DEBUG = -g + + # The location of flex. Not all versions of flex seem to work. + FLEX = flex +@@ -12,7 +12,7 @@ #QTDIR = /usr/local/qt QTINCL = -I$(QTDIR)/include QTCC = $(QTDIR)/bin/moc -QTLIBS = -L$(QTDIR)/lib -lqt -+QTLIBS = -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -lqt \ -+ -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lX11 -lXext -lSM \ -+ -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -lpng -lz ++QTLIBS = ${LDFLAGS} -L$(QTDIR)/lib -lqt -L$(X11BASE)/lib -lX11 -lXext -lSM -lpng -lz # Implicit rules needed to build .o files and Metaobject stuff (_m.o) .SUFFIXES: .cc .o .h _m.o diff --git a/x11/ebuilder/patches/patch-ab b/x11/ebuilder/patches/patch-ab new file mode 100644 index 00000000000..7557b3c0c29 --- /dev/null +++ b/x11/ebuilder/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2001/06/26 19:54:49 jlam Exp $ + +--- GNUmakefile.orig Sat Mar 25 08:30:53 2000 ++++ GNUmakefile +@@ -1,7 +1,7 @@ + # Include general flags + include config.mk + +-CXXFLAGS = $(QTINCL) $(DEBUG) -I. -I./inspect ++CXXFLAGS += $(QTINCL) $(DEBUG) -I. -I./inspect + + all: bin/ebuilder + diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile index cd98b4f5c54..8480a8084de 100644 --- a/x11/qwt/Makefile +++ b/x11/qwt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/04/30 11:03:30 skrll Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/26 20:42:59 jlam Exp $ DISTNAME= qwt-0.3.0 CATEGORIES= x11 @@ -8,15 +8,15 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://sourceforge.net/projects/qwt COMMENT= Qt widget library for technical purposes -DEPENDS+= qt2-libs-2.3.0:../../x11/qt2-libs +BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.0 +USE_BUILDLINK_ONLY= yes USE_X11BASE= yes USE_GMAKE= yes USE_LIBTOOL= yes -EVAL_PREFIX+= QT2DIR=qt2-libs -MAKE_ENV+= CXX="${CXX}" \ - QTDIR="${QT2DIR}/qt2" +MAKE_ENV+= CXX="${CXX}" +MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" CONFLICTS= qwtlib-* @@ -30,4 +30,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qwt ${INSTALL_DATA} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3 +.include "../../x11/qt2-libs/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qwt/distinfo b/x11/qwt/distinfo index 3dd47f2385d..009b3d74ce3 100644 --- a/x11/qwt/distinfo +++ b/x11/qwt/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2001/04/30 11:03:30 skrll Exp $ +$NetBSD: distinfo,v 1.4 2001/06/26 20:42:59 jlam Exp $ SHA1 (qwt-0.3.0.tar.gz) = 504940fbf25b058d258bba3589a22752a624847b Size (qwt-0.3.0.tar.gz) = 484675 bytes -SHA1 (patch-aa) = 5c55cc77207e6fba850c8534cae4db2384c31bbb +SHA1 (patch-aa) = e57c888c1c6ea486dfa24e84e7aaba72f406fa7e diff --git a/x11/qwt/patches/patch-aa b/x11/qwt/patches/patch-aa index c047a083141..4561293d5a9 100644 --- a/x11/qwt/patches/patch-aa +++ b/x11/qwt/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2001/04/30 11:03:31 skrll Exp $ +$NetBSD: patch-aa,v 1.2 2001/06/26 20:43:00 jlam Exp $ --- makefiles/netbsd-g++.orig Wed Dec 13 23:23:09 2000 +++ makefiles/netbsd-g++ @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.1 2001/04/30 11:03:31 skrll Exp $ -LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm +#LINK = g++ +#LFLAGS = -Bshareable -+LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L${X11BASE}/lib -lqt -lXext -lX11 -lm -Wl,-R${X11BASE}/lib ++LIBS = ${LDFLAGS} $(SUBLIBS) -L$(QTDIR)/lib -L${X11BASE}/lib -lqt -lXext -lX11 -lm AR = ar cqs RANLIB = MOC = $(QTDIR)/bin/moc |