pkg/25753: make qt3-libs pkgview ready.

[Joachim Kuebart <kuebart%mathematik.uni-ulm.de@localhost>]

>Number:         25753
>Category:       pkg
>Synopsis:       make qt3-libs pkgview ready.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun May 30 13:16:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Joachim Kuebart
>Release:        NetBSD 2.0B from around April 2, 2004.
>Organization:
>Environment:
        
        
System: NetBSD jaja 2.0B NetBSD 2.0B (ALPHA-$Revision: 1.191 $) #10: Thu Apr 22 
17:37:18 CEST 2004 joki@jaja:/home/joki/NetBSD/compile/JAJA alpha
Architecture: alpha
Machine: alpha
qt3-libs-3.3.2
>Description:
Make some changes to the package Makefile to make qt3-libs buildlink3 and
pkgview ready.
        
>How-To-Repeat:
Building qt3-libs in a pkgview setting (PKG_INSTALLATION_PREFS lists
pkgviews before overwrite).
        
>Fix:
        
The main thing to do here is to add several CFLAGS and LDFLAGS to
the configure invocation for include, library and runtime library paths
to dependencies provided by the buildlink3 framework.

Somewhat unconnected, distinfo is lacking patch-ad.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt3-libs/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile    16 Apr 2004 14:30:44 -0000      1.24
+++ Makefile    30 May 2004 13:11:42 -0000
@@ -3,12 +3,16 @@
 
 LIBQT=                 ${WRKSRC}/lib/libqt-mt.la
 
+# set this before Makefile.common which includes compiler.mk which includes
+# bsd.prefs.mk which sets PKG_INSTALLATION_TYPE to the wrong value.
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=               qt3-libs-${QTVERSION}
 COMMENT=               C++ X GUI toolkit
 
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 GCC_REQD+=             2.95.3
 
 ALL_TARGET=            sub-plugins
@@ -34,16 +38,16 @@
        ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqjpeg.la 
${QTPREFIX}/plugins/imageformats
        ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqmng.la 
${QTPREFIX}/plugins/imageformats
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../fonts/Xft2/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/MesaLib/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-.include "../../graphics/mng/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../x11/Xrandr/buildlink2.mk"
-.include "../../x11/xcursor/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/mng/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/Xrandr/buildlink3.mk"
+.include "../../x11/xcursor/buildlink3.mk"
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt3-libs/Makefile.common,v
retrieving revision 1.30
diff -u -r1.30 Makefile.common
--- Makefile.common     30 Mar 2004 21:50:19 -0000      1.30
+++ Makefile.common     30 May 2004 13:11:42 -0000
@@ -26,8 +26,7 @@
 CONFIGURE_ARGS+=       -shared -sm -thread -no-stl \
                        -system-zlib -system-libpng \
                        -system-libmng -system-libjpeg \
-                       -I${BUILDLINK_DIR}/include \
-                       -L${BUILDLINK_DIR}/lib
+                       ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//}
 CONFIGURE_ARGS+=       -qt-gif # qt3 does not write compressed GIFs
 
 CONFIGURE_ARGS+=       < ${FILESDIR}/license-acceptance
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt3-libs/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo    10 May 2004 06:47:09 -0000      1.21
+++ distinfo    30 May 2004 13:11:42 -0000
@@ -5,6 +5,7 @@
 SHA1 (patch-aa) = 0247c3694db7bf29556e00809b5d7f26817f3055
 SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
 SHA1 (patch-ac) = 1914c348846ae2ab0358e554d29ba49a0be90d52
+SHA1 (patch-ad) = 3d638078a207d5062d9a758d53053e85b1c22426
 SHA1 (patch-ae) = 16f35100cccc0b3e325fc8a2fd049bab5aca8056
 SHA1 (patch-af) = dde2d3cd4fa9eab0105ee097182a172756002347
 SHA1 (patch-ag) = d8185f4c98df1ba8db45b74ff06a204693a29da6

Note: pkglint bitches a lot about this Makefile (even before this
change). Alas I don't know how to do it differently...
>Release-Note:
>Audit-Trail:
>Unformatted: