Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.

6 files changed, 22 insertions, 65 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