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

-L and rpath specifications in the config files by directly substituting
their final values; this is needed since the configure script directly
manipulates these values via sed and needs the substituted values, not
just ${VAR}.  Also honor CXXFLAGS passed in from the environment (possibly
containing optimization flags) during the build.

5 files changed, 123 insertions, 38 deletions

diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 3faef530411..9e8b0832ad3 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.10 2001/05/22 09:32:28 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/23 19:35:27 jlam Exp $
 #
-USE_MESA=	yes
+#USE_MESA=		yes
 
 .include "../qt2-libs/Makefile.common"
 
-PKGNAME=	qt2-libs-${QTVERSION}
+PKGNAME=		qt2-libs-${QTVERSION}
+COMMENT=		C++ X GUI toolkit
 
-COMMENT=	C++ X GUI toolkit
+USE_BUILDLINK_ONLY=	yes
+CONFIGURE_ARGS+=	-I${BUILDLINK_DIR}/include
+CONFIGURE_ARGS+=	-L${BUILDLINK_DIR}/lib
 
-DEPENDS+=	png>=1.0.11:../../graphics/png
-DEPENDS+=	mng-1.0.0:../../graphics/mng
-DEPENDS+=	jpeg-*:../../graphics/jpeg
-
-CONFIGURE_ENV+=	QTDIR=${WRKSRC}
-MAKE_ENV+=	QTDIR=${WRKSRC}
+CONFIGURE_ENV+=		QTDIR="${WRKSRC}"
+MAKE_ENV+=		QTDIR="${WRKSRC}"
 
 ALL_TARGET=		sub-src
 
@@ -26,4 +25,9 @@ do-install:
 	${INSTALL_DATA_DIR} ${QTPREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include
 
+.include "../../devel/zlib/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
+.include "../../graphics/Mesa/buildlink.mk"
+.include "../../graphics/mng/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index b0c9a90511b..15af1ef9ce8 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2001/06/14 11:15:46 skrll Exp $
+# $NetBSD: Makefile.common,v 1.15 2001/06/23 19:35:27 jlam Exp $
 #
 
 DISTNAME=		qt-x11-${QTVERSION}
@@ -16,8 +16,7 @@ USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-static -sm -no-thread \
 			-system-zlib -system-libpng \
-			-system-libmng -system-jpeg \
-			-I${LOCALBASE}/include -L${LOCALBASE}/lib
+			-system-libmng -system-jpeg
 CONFIGURE_ARGS+=	-gif	# qt2 does not write compressed GIFs
 
 CONFIGURE_ARGS+=	< ${FILESDIR}/license-acceptance
@@ -26,6 +25,11 @@ QTPREFIX=		${PREFIX}/qt2
 
 MAKE_ENV+=		QTPREFIX=${QTPREFIX}
 
+MAKE_ENV+=		SYSCONF_CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+=		SYSCONF_CFLAGS="${CFLAGS}"
+MAKE_ENV+=		SYSCONF_CXXFLAGS_LIB="${CXXFLAGS}"
+MAKE_ENV+=		SYSCONF_CFLAGS_LIB="${CFLAGS}"
+
 DISTINFO_FILE=		${.CURDIR}/../../x11/qt2-libs/distinfo
 FILESDIR=		${.CURDIR}/../../x11/qt2-libs/files
 PATCHDIR=		${.CURDIR}/../../x11/qt2-libs/patches
@@ -33,7 +37,25 @@ PATCHDIR=		${.CURDIR}/../../x11/qt2-libs/patches
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-BUILD_DEPENDS+=	egcs-1.1.2:../../lang/egcs
-CONFIGURE_ENV+=	CXX=${LOCALBASE}/egcs/bin/g++
-CONFIGURE_ARGS+=-platform solaris-g++
+BUILD_DEPENDS+=		egcs-1.1.2:../../lang/egcs
+CONFIGURE_ENV+=		CXX=${LOCALBASE}/egcs/bin/g++
+CONFIGURE_ARGS+=	-platform solaris-g++
 .endif
+
+FILES_SUBST=		BUILDLINK_DIR=${BUILDLINK_DIR}
+FILES_SUBST+=		LOCALBASE=${LOCALBASE}
+FILES_SUBST+=		QTDIR=${QTPREFIX}
+FILES_SUBST+=		X11BASE=${X11BASE}
+FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+
+post-extract:
+	cd ${WRKSRC}/configs;						\
+	for file in netbsd-g++-static solaris-g++-static; do		\
+		${MV} -f $${file} $${file}.in;				\
+	done
+
+post-patch:
+	cd ${WRKSRC}/configs;						\
+	for file in netbsd-g++-static solaris-g++-static; do		\
+		${SED} ${FILES_SUBST_SED} $${file}.in > $${file};	\
+	done
diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo
index bac9db102e3..5c212303bf1 100644
--- a/x11/qt2-libs/distinfo
+++ b/x11/qt2-libs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2001/06/17 19:10:39 drochner Exp $
+$NetBSD: distinfo,v 1.4 2001/06/23 19:35:27 jlam Exp $
 
 SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823
 Size (qt-x11-2.3.1.tar.gz) = 8967271 bytes
 SHA1 (patch-aa) = 10f4cea8c2719c3c70becff88022e910778c4538
-SHA1 (patch-ab) = 0b8657fc5b28e4ffb58584988758fdc4a9900a34
-SHA1 (patch-ac) = a85cb26d5cdcaa9ef61021d105d56a3a78cf5389
+SHA1 (patch-ab) = 7f1cdc853e036f17fee51402756f68504c413d00
+SHA1 (patch-ac) = 25cbb7d243dc2c543b44d2870325d017b26604b0
 SHA1 (patch-ad) = 26482d22e1d016ef514a43a69a5d58b19f03193c
 SHA1 (patch-ae) = 3ca7c34f608458950e5036f4a0b9ca0c53f83343
 SHA1 (patch-af) = ea8b1c3f7a099a5492301281476ea831134ad97b
diff --git a/x11/qt2-libs/patches/patch-ab b/x11/qt2-libs/patches/patch-ab
index 0534f195937..8992d2de3a6 100644
--- a/x11/qt2-libs/patches/patch-ab
+++ b/x11/qt2-libs/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2000/12/12 06:30:27 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2001/06/23 19:35:27 jlam Exp $
 
---- configs/netbsd-g++-static.orig	Wed Nov  8 17:06:36 2000
-+++ configs/netbsd-g++-static
-@@ -1,21 +1,22 @@
+--- configs/netbsd-g++-static.in.orig	Wed Jun 13 04:56:48 2001
++++ configs/netbsd-g++-static.in
+@@ -1,44 +1,42 @@
  # Compiling
  INTERFACE_DECL_PATH 	= .
 -SYSCONF_CXX		= g++
@@ -13,10 +13,11 @@ $NetBSD: patch-ab,v 1.5 2000/12/12 06:30:27 jlam Exp $
  DASHCROSS		= 
  
  # Compiling with support libraries
- SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
+-SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
++SYSCONF_CXXFLAGS_X11	= -I@X11BASE@/include
  SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
 -SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_OPENGL	= -I${X11BASE}/include
++SYSCONF_CXXFLAGS_OPENGL	= -I@BUILDLINK_DIR@/include -I@X11BASE@/include
  
  # Compiling YACC output
  SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
@@ -25,18 +26,22 @@ $NetBSD: patch-ab,v 1.5 2000/12/12 06:30:27 jlam Exp $
 -SYSCONF_RPATH_X11	= 
 -SYSCONF_RPATH_QT	= 
 -SYSCONF_RPATH_OPENGL	= 
-+SYSCONF_RPATH_X11	= -Wl,-R${X11BASE}/lib
-+SYSCONF_RPATH_QT	= -Wl,-R${QTDIR}/lib
-+SYSCONF_RPATH_OPENGL	= -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib
++SYSCONF_RPATH_X11	= -Wl,-R@X11BASE@/lib
++SYSCONF_RPATH_QT	= -Wl,-R@QTDIR@/lib
++SYSCONF_RPATH_OPENGL	= -Wl,-R@X11BASE@/lib -Wl,-R@LOCALBASE@/lib
  
  # Linking with support libraries
  # X11
-@@ -26,19 +27,16 @@
+-SYSCONF_LFLAGS_X11	= -L/usr/X11R6/lib
++SYSCONF_LFLAGS_X11	= -L@X11BASE@/lib
+ SYSCONF_LIBS_X11	= -lXext -lX11 -lm
+ # Qt, Qt+OpenGL
+ SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
  SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
 -SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_OPENGL	= -L$(X11BASE)/lib
++SYSCONF_LFLAGS_OPENGL	= -L@BUILDLINK_DIR@/lib -L@X11BASE@/lib
  SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
  # Yacc
  SYSCONF_LIBS_YACC	= 
@@ -82,13 +87,17 @@ $NetBSD: patch-ab,v 1.5 2000/12/12 06:30:27 jlam Exp $
 -SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
 -				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
  # Compiling application source
- SYSCONF_CXXFLAGS	= -O2
- SYSCONF_CFLAGS		= -O2
+-SYSCONF_CXXFLAGS	= -O2
+-SYSCONF_CFLAGS		= -O2
 -SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
 -SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
++#SYSCONF_CXXFLAGS	= -O2
++#SYSCONF_CFLAGS		= -O2
  # Compiling library source
- SYSCONF_CXXFLAGS_LIB	=
- SYSCONF_CFLAGS_LIB	=
+-SYSCONF_CXXFLAGS_LIB	=
+-SYSCONF_CFLAGS_LIB	=
++#SYSCONF_CXXFLAGS_LIB	=
++#SYSCONF_CFLAGS_LIB	=
  # Compiling shared-object source
 -SYSCONF_CXXFLAGS_SHOBJ	= -fPIC
 -SYSCONF_CFLAGS_SHOBJ	= -fPIC
diff --git a/x11/qt2-libs/patches/patch-ac b/x11/qt2-libs/patches/patch-ac
index 25d59167f22..1e230e7010b 100644
--- a/x11/qt2-libs/patches/patch-ac
+++ b/x11/qt2-libs/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2000/12/05 18:32:05 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2001/06/23 19:35:27 jlam Exp $
 
---- configs/solaris-g++-static.orig	Wed Nov  8 18:06:39 2000
-+++ configs/solaris-g++-static	Thu Nov 30 13:09:00 2000
-@@ -2,6 +2,7 @@
+--- configs/solaris-g++-static.in.orig	Wed Jun 13 04:56:50 2001
++++ configs/solaris-g++-static.in
+@@ -2,31 +2,32 @@
  INTERFACE_DECL_PATH 	= .
  SYSCONF_CXX		= g++
  SYSCONF_CC		= gcc
@@ -10,3 +10,53 @@ $NetBSD: patch-ac,v 1.2 2000/12/05 18:32:05 drochner Exp $
  DASHCROSS		= 
  
  # Compiling with support libraries
+-SYSCONF_CXXFLAGS_X11	= -I/usr/openwin/include
++SYSCONF_CXXFLAGS_X11	= -I@X11BASE@/include
+ SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
+-SYSCONF_CXXFLAGS_OPENGL	= 
++SYSCONF_CXXFLAGS_OPENGL	= -I@BUILDLINK_DIR@/include -I@X11BASE@/include
+ 
+ # Compiling YACC output
+ SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
+ 
+ # Linking with support libraries
+-SYSCONF_RPATH_X11	= -Wl,-R,/usr/openwin/lib
+-SYSCONF_RPATH_QT	= -Wl,-R,$(QTDIR)/lib
+-SYSCONF_RPATH_OPENGL	= 
++SYSCONF_RPATH_X11	= -Wl,-R,@X11BASE@/lib
++SYSCONF_RPATH_QT	= -Wl,-R,@QTDIR@/lib
++SYSCONF_RPATH_OPENGL	= -Wl,-R@X11BASE@/lib -Wl,-R@LOCALBASE@/lib
+ 
+ # Linking with support libraries
+ # X11
+-SYSCONF_LFLAGS_X11	= -L/usr/openwin/lib
++SYSCONF_LFLAGS_X11	= -L@X11BASE@/lib
+ SYSCONF_LIBS_X11	= -lXext -lX11 -lm -lresolv -lsocket -lnsl
+ # Qt, Qt+OpenGL
+ SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
+ SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
+ SYSCONF_LIBS_QT_OPENGL	= 
+ # OpenGL
+-SYSCONF_LFLAGS_OPENGL	= 
++SYSCONF_LFLAGS_OPENGL	= -L@BUILDLINK_DIR@/lib -L@X11BASE@/lib
+ SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
+ # Yacc
+ SYSCONF_LIBS_YACC	= 
+@@ -77,13 +78,13 @@
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -O2
+-SYSCONF_CFLAGS		= -O2
++#SYSCONF_CXXFLAGS	= -O2
++#SYSCONF_CFLAGS		= -O2
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
+ # Compiling library source
+-SYSCONF_CXXFLAGS_LIB	=
+-SYSCONF_CFLAGS_LIB	=
++#SYSCONF_CXXFLAGS_LIB	=
++#SYSCONF_CFLAGS_LIB	=
+ # Compiling shared-object source
+ SYSCONF_CXXFLAGS_SHOBJ	= -fPIC
+ SYSCONF_CFLAGS_SHOBJ	= -fPIC