diff options
Diffstat (limited to 'x11')
60 files changed, 575 insertions, 204 deletions
diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile index 9fbf620c81f..d9c51cc3abb 100644 --- a/x11/Xbae/Makefile +++ b/x11/Xbae/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/04/17 03:03:07 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/25 18:40:27 jlam Exp $ # DISTNAME= Xbae-4.9.1 @@ -9,14 +9,14 @@ MAINTAINER= drochner@netbsd.org HOMEPAGE= http://www.lesstif.org/Xbae.html COMMENT= Motif-compatible widgets: XbaeMatrix, XbaeCaption, XbaeInput -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_X11BASE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-motif-includes=${BUILDLINK_DIR}/include -CONFIGURE_ARGS+= --with-motif-libraries=${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= --with-motif-includes=${MOTIFBASE}/include +CONFIGURE_ARGS+= --with-motif-libraries=${MOTIFBASE}/lib PLIST_SUBST+= LOCALBASE=${LOCALBASE} post-install: @@ -26,6 +26,5 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/ac_find_xbae.m4 \ ${LOCALBASE}/share/aclocal/ac_find_xbae.m4 -.include "../../mk/motif.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../mk/motif.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xbae/buildlink2.mk b/x11/Xbae/buildlink2.mk new file mode 100644 index 00000000000..9a795ad90b0 --- /dev/null +++ b/x11/Xbae/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:28 jlam Exp $ + +.if !defined(XBAE_BUILDLINK2_MK) +XBAE_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= Xbae +BUILDLINK_DEPENDS.Xbae?= Xbae>=4.8.4 +BUILDLINK_PKGSRCDIR.Xbae?= ../../x11/Xbae + +EVAL_PREFIX+= BUILDLINK_PREFIX.Xbae=Xbae +BUILDLINK_PREFIX.Xbae_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.Xbae= include/Xbae/* +BUILDLINK_FILES.Xbae+= lib/libXbae.* + +.include "../../mk/motif.buildlink2.mk" + +BUILDLINK_TARGETS+= Xbae-buildlink + +Xbae-buildlink: _BUILDLINK_USE + +.endif # XBAE_BUILDLINK2_MK diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 03202b2d027..f8e0d9be09c 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/10/24 22:11:12 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2002/08/25 18:40:29 jlam Exp $ # DISTNAME= ${PKGNAME}-source @@ -21,15 +21,14 @@ COMMENT= Fast Light Tool Kit for graphical user interfaces USE_X11BASE= # defined USE_GMAKE= # defined USE_LIBTOOL= # defined -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined -CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL} +CONFIGURE_ARGS+= --enable-libtool=${PKGLIBTOOL} test: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test -.include "../../graphics/Mesa/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/Mesa/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fltk/buildlink2.mk b/x11/fltk/buildlink2.mk new file mode 100644 index 00000000000..16ede3b1e94 --- /dev/null +++ b/x11/fltk/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:29 jlam Exp $ + +.if !defined(FLTK_BUILDLINK2_MK) +FLTK_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= fltk +BUILDLINK_DEPENDS.fltk?= fltk>=1.0.9 +BUILDLINK_PKGSRCDIR.fltk?= ../../x11/fltk + +EVAL_PREFIX+= BUILDLINK_PREFIX.fltk=fltk +BUILDLINK_PREFIX.fltk_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.fltk= include/FL/* +BUILDLINK_FILES.fltk+= lib/libfltk.* + +.include "../../graphics/Mesa/buildlink2.mk" + +BUILDLINK_TARGETS+= fltk-buildlink + +fltk-buildlink: _BUILDLINK_USE + +.endif # FLTK_BUILDLINK2_MK diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index dc077480d53..0e2b2ce2af7 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2002/03/24 19:53:40 rh Exp $ +# $NetBSD: Makefile,v 1.77 2002/08/25 18:40:30 jlam Exp $ DISTNAME= gnome-libs-1.4.1.4 CATEGORIES= x11 gnome @@ -23,7 +23,7 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \ X11BASE=${X11BASE} \ PKGLOCALEDIR=${PKGLOCALEDIR} -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES LOCALSTATEDIR= /var/gnome PLIST_SUBST+= LOCALBASE=${LOCALBASE} \ @@ -33,9 +33,9 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} \ .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -.include "../../databases/db/buildlink.mk" +. include "../../databases/db/buildlink2.mk" -CPPFLAGS+= -I${BUILDLINK_DIR}/include/db2 +CPPFLAGS+= -I${BUILDLINK_PREFIX.db}/include/db2 pre-configure: ${MV} ${WRKSRC}/configure ${WRKSRC}/configure-pre-db-sub && \ @@ -63,11 +63,11 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \ ${LOCALBASE}/share/aclocal/libart.m4 -.include "../../audio/esound/buildlink.mk" -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../net/ORBit/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../audio/esound/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../net/ORBit/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-libs/PLIST b/x11/gnome-libs/PLIST index add4dcc2008..3ad23a5e873 100644 --- a/x11/gnome-libs/PLIST +++ b/x11/gnome-libs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2002/07/01 10:10:00 agc Exp $ +@comment $NetBSD: PLIST,v 1.8 2002/08/25 18:40:30 jlam Exp $ bin/dns-helper bin/gconfigger bin/gnome-bug diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk index b9c99f98f16..9766a2e235b 100644 --- a/x11/gnome-libs/buildlink.mk +++ b/x11/gnome-libs/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.17 2002/07/14 01:19:15 rh Exp $ +# $NetBSD: buildlink.mk,v 1.18 2002/08/25 18:40:31 jlam Exp $ # # This Makefile fragment is included by packages that use gnome-libs. # diff --git a/x11/gnome-libs/buildlink2.mk b/x11/gnome-libs/buildlink2.mk new file mode 100644 index 00000000000..2d45f1405fe --- /dev/null +++ b/x11/gnome-libs/buildlink2.mk @@ -0,0 +1,41 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:31 jlam Exp $ + +.if !defined(GNOME_LIBS_BUILDLINK2_MK) +GNOME_LIBS_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= gnome-libs +BUILDLINK_DEPENDS.gnome-libs?= gnome-libs>=1.4.1.4 +BUILDLINK_PKGSRCDIR.gnome-libs?= ../../x11/gnome-libs + +EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-libs=gnome-libs +BUILDLINK_PREFIX.gnome-libs_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.gnome-libs= include/gnome-1.0/gnome.h +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/gtk-xmhtml/* +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/libart_lgpl/* +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/libgnome/* +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/libgnomeui/* +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/libgnorba/* +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/popt-gnome.h +BUILDLINK_FILES.gnome-libs+= include/gnome-1.0/zvt/* +BUILDLINK_FILES.gnome-libs+= lib/gnome-libs/*/* +BUILDLINK_FILES.gnome-libs+= lib/libart_lgpl.* +BUILDLINK_FILES.gnome-libs+= lib/libgnome.* +BUILDLINK_FILES.gnome-libs+= lib/libgnomesupport.* +BUILDLINK_FILES.gnome-libs+= lib/libgnomeui.* +BUILDLINK_FILES.gnome-libs+= lib/libgnorba.* +BUILDLINK_FILES.gnome-libs+= lib/libgnorbagtk.* +BUILDLINK_FILES.gnome-libs+= lib/libgtkxmhtml.* +BUILDLINK_FILES.gnome-libs+= lib/libzvt.* + +.include "../../audio/esound/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../net/ORBit/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + +BUILDLINK_TARGETS+= gnome-libs-buildlink + +gnome-libs-buildlink: _BUILDLINK_USE + +.endif # GNOME_LIBS_BUILDLINK2_MK diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo index a41390daa47..2c9f94092e5 100644 --- a/x11/gnome-libs/distinfo +++ b/x11/gnome-libs/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.13 2002/08/01 13:25:54 tron Exp $ +$NetBSD: distinfo,v 1.14 2002/08/25 18:40:31 jlam Exp $ SHA1 (gnome-libs-1.4.1.4.tar.gz) = 3315752f9d4e8392c5e7b902d45cc7b795cdd63a Size (gnome-libs-1.4.1.4.tar.gz) = 3631342 bytes -SHA1 (patch-aa) = ed906dfe8164bacabbe4f2922eecd10125a76b26 +SHA1 (patch-aa) = bcc6ba3d4375a38fe8b515725aff4903e6df1be7 SHA1 (patch-ab) = 13a6c8c58a1acfb61150d13408fa260a82f49484 SHA1 (patch-ac) = 601cb8850ab9497fb9ab25843d1e9fd47306256e SHA1 (patch-ad) = 10e46c8965137c8c0a3acf177898ca07fb4c90fa diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa index 147f0413f3b..ecd77adabf0 100644 --- a/x11/gnome-libs/patches/patch-aa +++ b/x11/gnome-libs/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.16 2002/03/24 19:53:42 rh Exp $ +$NetBSD: patch-aa,v 1.17 2002/08/25 18:40:32 jlam Exp $ --- configure.orig Tue Jan 22 14:35:12 2002 +++ configure @@ -12,8 +12,8 @@ $NetBSD: patch-aa,v 1.16 2002/03/24 19:53:42 rh Exp $ - GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/\(-L[^ ]*\) .*$/\1/' -e 's/^.*\(-L[^ ]*\)$/\1/'` -fi -GLIB_LIBS="$GLIB_LDFLAGS `echo $GTK_LIBS | sed 's/^.*\(-lglib[^ ]*\).*$/\1/'`" -+GLIB_CFLAGS="`$GLIB_CONFIG --cflags`" -+GLIB_LIBS="`$GLIB_CONFIG --libs`" ++GLIB_CFLAGS="`glib-config --cflags`" ++GLIB_LIBS="`glib-config --libs`" +GLIB_LDFLAGS="$GLIB_LIBS" diff --git a/x11/gnome-libs/patches/patch-ac b/x11/gnome-libs/patches/patch-ac index 1159a9fd0a8..a4a70c0fb88 100644 --- a/x11/gnome-libs/patches/patch-ac +++ b/x11/gnome-libs/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.12 2002/08/01 13:25:55 tron Exp $ +$NetBSD: patch-ac,v 1.13 2002/08/25 18:40:32 jlam Exp $ --- zvt/subshell-includes.h.orig Fri Jun 15 02:04:52 2001 +++ zvt/subshell-includes.h Thu Aug 1 15:15:35 2002 diff --git a/x11/gnome-libs/patches/patch-az b/x11/gnome-libs/patches/patch-az index 371c60d66ae..f57724934cc 100644 --- a/x11/gnome-libs/patches/patch-az +++ b/x11/gnome-libs/patches/patch-az @@ -1,4 +1,4 @@ -$NetBSD: patch-az,v 1.1 2002/07/01 10:10:01 agc Exp $ +$NetBSD: patch-az,v 1.2 2002/08/25 18:40:32 jlam Exp $ --- libart_lgpl/doc/Makefile.in 2002/06/28 10:35:09 1.1 +++ libart_lgpl/doc/Makefile.in 2002/06/28 10:35:23 diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 3b1e833f836..da0b6a161f6 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2002/08/13 14:53:31 tron Exp $ +# $NetBSD: Makefile,v 1.75 2002/08/25 18:40:33 jlam Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 3 @@ -14,7 +14,7 @@ COMMENT= Gimp toolkit. Libraries for building X11 user interfaces BUILD_USES_MSGFMT= yes -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_PERL5= build USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig @@ -35,7 +35,7 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} # The following ensures that `gtk-config --libs' includes the correct linker # flags for linking the X11 libs. # -X_LDFLAGS= -Wl,-R${X11BASE}/lib -L${BUILDLINK_X11_DIR}/lib +X_LDFLAGS= -L${X11BASE}/lib -Wl,-R${X11BASE}/lib GTK_VERSION= ${DISTNAME:S/gtk+-//} GTK_MAJOR_VERSION= ${GTK_VERSION:C/\..*//} @@ -65,8 +65,7 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/gtk.m4 \ ${LOCALBASE}/share/aclocal/gtk.m4 -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/glib/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/glib/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk/PLIST b/x11/gtk/PLIST index cfb90b9903e..e99bb0b7090 100644 --- a/x11/gtk/PLIST +++ b/x11/gtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/08/01 09:32:16 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/08/25 18:40:33 jlam Exp $ bin/gtk-config share/gtk/gtkrc.az share/gtk/gtkrc.be diff --git a/x11/gtk/buildlink2.mk b/x11/gtk/buildlink2.mk new file mode 100644 index 00000000000..78b57d90d49 --- /dev/null +++ b/x11/gtk/buildlink2.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:33 jlam Exp $ + +.if !defined(GTK_BUILDLINK2_MK) +GTK_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= gtk +BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.8 +BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk + +EVAL_PREFIX+= BUILDLINK_PREFIX.gtk=gtk +BUILDLINK_PREFIX.gtk_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.gtk= include/gdk/* +BUILDLINK_FILES.gtk+= include/gtk/* +BUILDLINK_FILES.gtk+= include/gtk-*/*/* +BUILDLINK_FILES.gtk+= lib/libgdk.* +BUILDLINK_FILES.gtk+= lib/libgtk.* + +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/glib/buildlink2.mk" + +BUILDLINK_TARGETS+= gtk-buildlink + +gtk-buildlink: _BUILDLINK_USE + +.endif # GTK_BUILDLINK2_MK diff --git a/x11/gtk/distinfo b/x11/gtk/distinfo index fdd41e3ad09..660a4a5112c 100644 --- a/x11/gtk/distinfo +++ b/x11/gtk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/07/18 02:19:33 rh Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 18:40:34 jlam Exp $ SHA1 (gtk+-1.2.10.tar.gz) = a5adcb909257da01ae4d4761e1d41081d06e4d7c Size (gtk+-1.2.10.tar.gz) = 2868322 bytes diff --git a/x11/gtk/patches/patch-ag b/x11/gtk/patches/patch-ag index 8c3c29016f5..3cf44e21680 100644 --- a/x11/gtk/patches/patch-ag +++ b/x11/gtk/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1 2002/07/18 02:19:34 rh Exp $ +$NetBSD: patch-ag,v 1.2 2002/08/25 18:40:34 jlam Exp $ --- gdk.pc.in.orig Thu Nov 30 11:18:35 2000 +++ gdk.pc.in diff --git a/x11/gtk/patches/patch-ah b/x11/gtk/patches/patch-ah index 3f01b379916..083a051d8d5 100644 --- a/x11/gtk/patches/patch-ah +++ b/x11/gtk/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1 2002/07/18 02:19:35 rh Exp $ +$NetBSD: patch-ah,v 1.2 2002/08/25 18:40:35 jlam Exp $ --- gtk+.pc.in.orig Thu Nov 30 11:18:35 2000 +++ gtk+.pc.in diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 14f35a50e95..92946b66435 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2002/08/15 08:38:33 skrll Exp $ +# $NetBSD: Makefile,v 1.39 2002/08/25 18:40:35 jlam Exp $ DISTNAME= kdelibs-2.2.2 PKGREVISION= 2 @@ -7,14 +7,14 @@ COMMENT= Support libraries for the KDE integrated X11 desktop .include "../../x11/kde2/Makefile.kde2" -BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.8 +BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.8 BUILDLINK_DEPENDS.audiofile= libaudiofile>=0.1.9 BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.1nb2 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_OPENSSL_VERSION= ${OPENSSL_VERSION_096} -CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_DIR}" +CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" .if (${MACHINE_ARCH} == "arm32") BROKEN= Compilation causes arm32 machines to hang @@ -28,22 +28,9 @@ LIBS+= -Wl,--export-dynamic GCC_VERSION!= gcc --version .if (${GCC_VERSION:C/-.*$$//} == egcs) && (${MACHINE_ARCH} == alpha) -.include "../../lang/gcc/Makefile.gcc" +. include "../../lang/gcc/Makefile.gcc" .endif -# Override KDE_INCLUDES and QT_INCLUDES at build-time since their values -# are used by reference within the kdelibs2 Makefiles -# -MAKE_FLAGS+= KDE_INCLUDES="-I${BUILDLINK_DIR}/include" -MAKE_FLAGS+= QT_INCLUDES="-I${BUILDLINK_QTDIR}/include" - -# The configure script looks for xml2-config in the environment as -# ${XML_CONFIG}, not as ${XML2_CONFIG} like it's supposed to. -# -CONFIGURE_ENV+= XML_CONFIG="${XML2_CONFIG}" -KDEDIR= ${PREFIX} -BUILDLINK_KDEDIR= ${BUILDLINK_DIR} - REPLACE_PERL= \ ${WRKSRC}/kio/proxytype.pl \ ${WRKSRC}/kio/useragent.pl @@ -52,7 +39,7 @@ PLIST_SRC= ${WRKDIR}/PLIST UNLIMIT_RESOURCES= datasize .if defined(USE_CUPS) && (${USE_CUPS} == "YES") -.include "../../print/cups/buildlink.mk" +. include "../../print/cups/buildlink2.mk" BUILD_DEFS+= USE_CUPS PLIST_SUBST+= CUPS= @@ -106,27 +93,29 @@ post-install: ${ECHO} "@dirrm share/kde"; \ ) > ${PLIST_SRC} -.include "../../archivers/bzip2/buildlink.mk" -.include "../../audio/libaudiofile/buildlink.mk" -.include "../../devel/pcre/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../lang/perl5/buildlink.mk" -.include "../../security/openssl/buildlink.mk" -.include "../../textproc/libxml2/buildlink.mk" -.include "../../textproc/libxslt/buildlink.mk" -.include "../../x11/kde2/buildlink.mk" -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/ossaudio.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../archivers/bzip2/buildlink2.mk" +.include "../../audio/libaudiofile/buildlink2.mk" +.include "../../devel/pcre/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../lang/perl5/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../textproc/libxml2/buildlink2.mk" +.include "../../textproc/libxslt/buildlink2.mk" +.include "../../x11/kde2/buildlink2.mk" +.include "../../x11/qt2-libs/buildlink2.mk" +.include "../../mk/ossaudio.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" # XXX On NetBSD, the egcs and gcc-2.95.3 for: # XXX # XXX alpha # XXX -# XXX has an optimization bug when compiling with -O2 that is tickled by -# XXX ${WRKSRC}/kdeprint/management/kmiconview.cpp. -# XXX ${WRKSRC}/kdecore/kwinmodule.cpp +# XXX have an optimization bug when compiling with -O2 that is tickled by: +# XXX +# XXX ${WRKSRC}/kdeprint/management/kmiconview.cpp +# XXX ${WRKSRC}/kdecore/kwinmodule.cpp +# .if ${OPSYS} == "NetBSD" . if (${MACHINE_ARCH} == "alpha") CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*//g} diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk index 0a7a4a75177..6c970f5d327 100644 --- a/x11/kdelibs2/buildlink.mk +++ b/x11/kdelibs2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.21 2002/08/15 08:48:08 skrll Exp $ +# $NetBSD: buildlink.mk,v 1.22 2002/08/25 18:40:35 jlam Exp $ # # This Makefile fragment is included by packages that use kdelibs2. # diff --git a/x11/kdelibs2/buildlink2.mk b/x11/kdelibs2/buildlink2.mk new file mode 100644 index 00000000000..28c6bb286fe --- /dev/null +++ b/x11/kdelibs2/buildlink2.mk @@ -0,0 +1,36 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:36 jlam Exp $ + +.if !defined(KDELIBS2_BUILDLINK2_MK) +KDELIBS2_BUILDLINK2_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +BUILDLINK_PACKAGES+= kdelibs2 +BUILDLINK_DEPENDS.kdelibs2?= kdelibs>=2.2.2nb2 +BUILDLINK_PKGSRCDIR.kdelibs2?= ../../x11/kdelibs2 + +EVAL_PREFIX+= BUILDLINK_PREFIX.kdelibs2=kdelibs +BUILDLINK_PREFIX.kdelibs2_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.kdelibs2!= ${GREP} "^\(include\|lib\)" ${.CURDIR}/../../x11/kdelibs2/PLIST + +KDEDIR= ${BUILDLINK_PREFIX.kdelibs2} + +BUILDLINK_DEPENDS.audiofile= libaudiofile>=0.1.9 +BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.1nb2 +USE_OPENSSL_VERSION= ${OPENSSL_VERSION_096} + +.include "../../audio/libaudiofile/buildlink2.mk" +.include "../../devel/pcre/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../x11/qt2-libs/buildlink2.mk" +.include "../../mk/ossaudio.buildlink2.mk" + +.if defined(USE_CUPS) && (${USE_CUPS} == "YES") +.include "../../print/cups/buildlink2.mk" +.endif + +BUILDLINK_TARGETS+= kdelibs2-buildlink + +kdelibs2-buildlink: _BUILDLINK_USE + +.endif # KDELIBS2_BUILDLINK2_MK diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo index 4672e7b5b2d..74ee881ce9d 100644 --- a/x11/kdelibs2/distinfo +++ b/x11/kdelibs2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2002/08/16 12:21:53 tron Exp $ +$NetBSD: distinfo,v 1.20 2002/08/25 18:40:36 jlam Exp $ SHA1 (kdelibs-2.2.2.tar.bz2) = 6ae1096ffb547f317adca6b29cb9ce9dcaf1863c Size (kdelibs-2.2.2.tar.bz2) = 5955592 bytes diff --git a/x11/kdelibs2/patches/patch-bt b/x11/kdelibs2/patches/patch-bt index a764b508680..c6e4cc777ab 100644 --- a/x11/kdelibs2/patches/patch-bt +++ b/x11/kdelibs2/patches/patch-bt @@ -1,4 +1,4 @@ -$NetBSD: patch-bt,v 1.2 2002/08/15 08:38:34 skrll Exp $ +$NetBSD: patch-bt,v 1.3 2002/08/25 18:40:36 jlam Exp $ --- kssl/kopenssl.cc.orig Wed Sep 5 00:08:18 2001 +++ kssl/kopenssl.cc diff --git a/x11/kdelibs2/patches/patch-bw b/x11/kdelibs2/patches/patch-bw index 91ef000444c..a35e06e119f 100644 --- a/x11/kdelibs2/patches/patch-bw +++ b/x11/kdelibs2/patches/patch-bw @@ -1,4 +1,4 @@ -$NetBSD: patch-bw,v 1.2 2002/08/15 08:38:34 skrll Exp $ +$NetBSD: patch-bw,v 1.3 2002/08/25 18:40:37 jlam Exp $ --- kssl/ksslcertificate.cc.orig Thu Aug 15 09:25:29 2002 +++ kssl/ksslcertificate.cc diff --git a/x11/kdelibs2/patches/patch-by b/x11/kdelibs2/patches/patch-by index fc074b8100d..ac5ffa28dcf 100644 --- a/x11/kdelibs2/patches/patch-by +++ b/x11/kdelibs2/patches/patch-by @@ -1,4 +1,4 @@ -$NetBSD: patch-by,v 1.1 2002/08/15 08:38:34 skrll Exp $ +$NetBSD: patch-by,v 1.2 2002/08/25 18:40:37 jlam Exp $ --- kssl/kopenssl.h.orig Sun Jul 29 05:55:41 2001 +++ kssl/kopenssl.h diff --git a/x11/kdelibs2/patches/patch-bz b/x11/kdelibs2/patches/patch-bz index 8b7254a47ec..8767779b41c 100644 --- a/x11/kdelibs2/patches/patch-bz +++ b/x11/kdelibs2/patches/patch-bz @@ -1,4 +1,4 @@ -$NetBSD: patch-bz,v 1.1 2002/08/16 12:21:53 tron Exp $ +$NetBSD: patch-bz,v 1.2 2002/08/25 18:40:37 jlam Exp $ --- kdesu/kdesu_pty.cpp.orig Wed Apr 11 18:48:56 2001 +++ kdesu/kdesu_pty.cpp Fri Aug 16 14:19:18 2002 diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index c8bd1832464..c39b56611af 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.61 2001/10/03 10:03:54 jlam Exp $ +# $NetBSD: Makefile,v 1.62 2002/08/25 18:40:37 jlam Exp $ COMMENT= API compatible clone of the OSF/Motif toolkit CONFLICTS+= openmotif-[0-9]* -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined .include "Makefile.common" @@ -36,5 +36,4 @@ pre-install: post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/lesstif/PLIST b/x11/lesstif/PLIST index 2031ab1c02f..9118d59c7ed 100644 --- a/x11/lesstif/PLIST +++ b/x11/lesstif/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/05/20 19:11:07 cjep Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:40:38 jlam Exp $ bin/mwm bin/mxmkmf bin/uil diff --git a/x11/lesstif/buildlink2.mk b/x11/lesstif/buildlink2.mk new file mode 100644 index 00000000000..ba8dc49c174 --- /dev/null +++ b/x11/lesstif/buildlink2.mk @@ -0,0 +1,23 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:38 jlam Exp $ + +.if !defined(LESSTIF_BUILDLINK2_MK) +LESSTIF_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= lesstif +BUILDLINK_DEPENDS.lesstif?= lesstif>=0.91.4 +BUILDLINK_PKGSRCDIR.lesstif?= ../../x11/lesstif + +EVAL_PREFIX+= BUILDLINK_PREFIX.lesstif=lesstif +BUILDLINK_PREFIX.lesstif_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.lesstif= include/Mrm/* +BUILDLINK_FILES.lesstif+= include/Xm/* +BUILDLINK_FILES.lesstif+= include/uil/* +BUILDLINK_FILES.lesstif+= lib/libMrm.* +BUILDLINK_FILES.lesstif+= lib/libUil.* +BUILDLINK_FILES.lesstif+= lib/libXm.* + +BUILDLINK_TARGETS+= lesstif-buildlink + +lesstif-buildlink: _BUILDLINK_USE + +.endif # LESSTIF_BUILDLINK2_MK diff --git a/x11/lesstif12/Makefile b/x11/lesstif12/Makefile index 47bc8c5de45..ccee4a8ab66 100644 --- a/x11/lesstif12/Makefile +++ b/x11/lesstif12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/09/14 01:57:44 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 18:40:39 jlam Exp $ PKGNAME= lesstif12-${LESSTIF_VERSION} COMMENT= API compatible clone of the OSF/Motif toolkit, version 1.2 @@ -7,7 +7,7 @@ CONFLICTS+= lesstif-0.[0-8]* CONFLICTS+= lesstif-0.90* CONFLICTS+= lesstif-0.91 lesstif-0.91.[0-3] -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined .include "../lesstif/Makefile.common" @@ -22,5 +22,4 @@ CONFIGURE_ARGS+= --enable-default-12 post-install: ${RMDIR} -p ${PREFIX}/share/doc/html/lesstif 2> /dev/null || ${TRUE} -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/lesstif12/buildlink2.mk b/x11/lesstif12/buildlink2.mk new file mode 100644 index 00000000000..ed5ee4bbf33 --- /dev/null +++ b/x11/lesstif12/buildlink2.mk @@ -0,0 +1,24 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:39 jlam Exp $ + +.if !defined(LESSTIF12_BUILDLINK2_MK) +LESSTIF12_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= lesstif12 +BUILDLINK_DEPENDS.lesstif12?= lesstif12>=0.91.4 +BUILDLINK_PKGSRCDIR.lesstif12?= ../../x11/lesstif12 + +EVAL_PREFIX+= _LESSTIF12_PREFIX=lesstif12 +_LESSTIF12_PREFIX_DEFAULT= ${X11PREFIX} +BUILDLINK_PREFIX.lesstif12= ${_LESSTIF12_PREFIX}/LessTif/Motif1.2 +BUILDLINK_FILES.lesstif12= include/Mrm/* +BUILDLINK_FILES.lesstif12+= include/Xm/* +BUILDLINK_FILES.lesstif12+= include/uil/* +BUILDLINK_FILES.lesstif12+= lib/libMrm.* +BUILDLINK_FILES.lesstif12+= lib/libUil.* +BUILDLINK_FILES.lesstif12+= lib/libXm.* + +BUILDLINK_TARGETS+= lesstif12-buildlink + +lesstif12-buildlink: _BUILDLINK_USE + +.endif # LESSTIF12_BUILDLINK2_MK diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index dc9644ac051..b26c970554c 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/01/10 12:10:45 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 18:40:39 jlam Exp $ # FreeBSD: /c/ncvs/ports/x11-toolkits/open-motif/Makefile,v 1.18 2000/10/09 01:40:02 asami Exp # OpenBSD: Makefile,v 1.5 2000/10/23 16:08:12 espie Exp @@ -25,7 +25,7 @@ CONFLICTS+= lesstif-[0-9]* DIST_SUBDIR= openmotif WRKSRC= ${WRKDIR}/motif USE_X11BASE= # defined -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined ALL_TARGET= World DEINSTALL_TMPL= ${.CURDIR}/DEINSTALL @@ -105,6 +105,5 @@ post-install: ${INSTALL_MAN} $${file} ${PREFIX}/man/$${file}; \ done -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/openmotif/buildlink2.mk b/x11/openmotif/buildlink2.mk new file mode 100644 index 00000000000..64e67004677 --- /dev/null +++ b/x11/openmotif/buildlink2.mk @@ -0,0 +1,23 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:40 jlam Exp $ + +.if !defined(OPENMOTIF_BUILDLINK2_MK) +OPENMOTIF_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= openmotif +BUILDLINK_DEPENDS.openmotif?= openmotif>=2.1.30 +BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif + +EVAL_PREFIX+= BUILDLINK_PREFIX.openmotif=openmotif +BUILDLINK_PREFIX.openmotif_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.openmotif= include/Mrm/* +BUILDLINK_FILES.openmotif+= include/Xm/* +BUILDLINK_FILES.openmotif+= include/uil/* +BUILDLINK_FILES.openmotif+= lib/libMrm.* +BUILDLINK_FILES.openmotif+= lib/libUil.* +BUILDLINK_FILES.openmotif+= lib/libXm.* + +BUILDLINK_TARGETS+= openmotif-buildlink + +openmotif-buildlink: _BUILDLINK_USE + +.endif # OPENMOTIF_BUILDLINK2_MK diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo index 0365b4fdcc8..0dec8634f5c 100644 --- a/x11/openmotif/distinfo +++ b/x11/openmotif/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2002/06/22 04:38:31 jlam Exp $ +$NetBSD: distinfo,v 1.8 2002/08/25 18:40:40 jlam Exp $ SHA1 (openmotif/openmotif2.1.30.tar.gz) = 34fc82fdf0e200525864665e179246ef64082dcc Size (openmotif/openmotif2.1.30.tar.gz) = 17711487 bytes diff --git a/x11/openmotif/patches/patch-ap b/x11/openmotif/patches/patch-ap index d77f040d844..eaf406f84c7 100644 --- a/x11/openmotif/patches/patch-ap +++ b/x11/openmotif/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.2 2002/06/22 04:38:31 jlam Exp $ +$NetBSD: patch-ap,v 1.3 2002/08/25 18:40:40 jlam Exp $ --- config/cf/NetBSD.cf.orig Sat Jun 22 00:09:12 2002 +++ config/cf/NetBSD.cf diff --git a/x11/openmotif/patches/patch-as b/x11/openmotif/patches/patch-as index 64a9fbdb628..eaf3628e1ab 100644 --- a/x11/openmotif/patches/patch-as +++ b/x11/openmotif/patches/patch-as @@ -1,4 +1,4 @@ -$NetBSD: patch-as,v 1.1 2002/06/22 04:38:32 jlam Exp $ +$NetBSD: patch-as,v 1.2 2002/08/25 18:40:41 jlam Exp $ --- config/cf/Imake.cf.orig Sat Jun 22 00:09:11 2002 +++ config/cf/Imake.cf diff --git a/x11/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile index fa8555e395c..46e6ff51fcd 100644 --- a/x11/qt2-designer-kde/Makefile +++ b/x11/qt2-designer-kde/Makefile @@ -1,32 +1,32 @@ -# $NetBSD: Makefile,v 1.10 2002/03/14 13:57:53 tron Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 18:40:42 jlam Exp $ # -.include "../qt2-libs/Makefile.common" - PKGNAME= qt2-designer-kde-${QTVERSION} PKGREVISION= 2 COMMENT= Visual (WYSIWYG) QT GUI builder with KDE widget support CONFLICTS+= qt2-designer-[0-9]* -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}nb2 +.include "../qt2-libs/Makefile.common" + CONFIGURE_ARGS+= -kde -CONFIGURE_ENV+= QTDIR="${QTPREFIX}" \ - KDEDIR="${BUILDLINK_DIR}" -MAKE_ENV+= QTDIR=${QTPREFIX} \ - KDEDIR="${BUILDLINK_DIR}" +CONFIGURE_ENV+= KDEDIR="${KDEDIR}" +MAKE_ENV+= KDEDIR="${KDEDIR}" ALL_TARGET= sub-tools UNLIMIT_RESOURCES= datasize do-install: - ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib - ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin - ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin + ${PKGLIBTOOL} ${INSTALL_DATA} \ + ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib + ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin + ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin + +.include "../../x11/kdelibs2/buildlink2.mk" -.include "../../x11/kdelibs2/buildlink.mk" -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile index 8e55a32f581..98c9e278b27 100644 --- a/x11/qt2-designer/Makefile +++ b/x11/qt2-designer/Makefile @@ -1,7 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/03/13 17:38:01 fredb Exp $ -# - -.include "../qt2-libs/Makefile.common" +# $NetBSD: Makefile,v 1.17 2002/08/25 18:40:41 jlam Exp $ PKGNAME= qt2-designer-${QTVERSION} PKGREVISION= 2 @@ -9,15 +6,21 @@ COMMENT= Visual (WYSIWYG) QT GUI builder CONFLICTS+= qt2-designer-kde-[0-9]* -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}nb2 +.include "../qt2-libs/Makefile.common" + ALL_TARGET= sub-tools do-install: - ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib - ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin - ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin + ${PKGLIBTOOL} ${INSTALL_DATA} \ + ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib + ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin + ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin + +.include "../../x11/qt2-libs/buildlink2.mk" -.include "../../x11/qt2-libs/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt2-designer/buildlink2.mk b/x11/qt2-designer/buildlink2.mk new file mode 100644 index 00000000000..7f7f743e1d2 --- /dev/null +++ b/x11/qt2-designer/buildlink2.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:41 jlam Exp $ + +.if !defined(QT2_DESIGNER_BUILDLINK2_MK) +QT2_DESIGNER_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= qt2-designer +BUILDLINK_DEPENDS.qt2-designer?= \ + {qt2-designer>=2.3.1nb2,qt2-designer-kde>=2.3.1nb2} +BUILDLINK_PKGSRCDIR.qt2-designer?= ../../x11/qt2-designer + +EVAL_PREFIX+= BUILDLINK_PREFIX.qt2-designer=qt2-designer +BUILDLINK_PREFIX.qt2-designer_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.qt2-designer= qt2/bin/designer +BUILDLINK_FILES.qt2-designer+= qt2/bin/uic +BUILDLINK_FILES.qt2-designer+= qt2/lib/libqutil.* + +.include "../../x11/qt2-libs/buildlink2.mk" + +CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic" +MAKE_ENV+= UIC="${QTDIR}/bin/uic" + +BUILDLINK_TARGETS+= qt2-designer-buildlink + +qt2-designer-buildlink: _BUILDLINK_USE + +.endif # QT2_DESIGNER_BUILDLINK2_MK diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile index 26e206fb083..84f80f8c794 100644 --- a/x11/qt2-libs/Makefile +++ b/x11/qt2-libs/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.17 2002/03/13 17:38:02 fredb Exp $ -# -#USE_MESA= yes +# $NetBSD: Makefile,v 1.18 2002/08/25 18:40:42 jlam Exp $ -.include "../qt2-libs/Makefile.common" +PKGNAME= qt2-libs-${QTVERSION} +PKGREVISION= 2 +COMMENT= C++ X GUI toolkit + +USE_BUILDLINK2= yes -PKGNAME= qt2-libs-${QTVERSION} -PKGREVISION= 2 -COMMENT= C++ X GUI toolkit +.include "../qt2-libs/Makefile.common" -USE_BUILDLINK_ONLY= yes -CONFIGURE_ARGS+= -I${BUILDLINK_DIR}/include -CONFIGURE_ARGS+= -L${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= -I${LOCALBASE}/include -I${X11BASE}/include +CONFIGURE_ARGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib CONFIGURE_ENV+= QTDIR="${WRKSRC}" MAKE_ENV+= QTDIR="${WRKSRC}" @@ -22,14 +21,14 @@ do-install: ${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin ${INSTALL_DATA_DIR} ${QTPREFIX}/lib - ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${QTPREFIX}/lib + ${PKGLIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${QTPREFIX}/lib ${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/x11.buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/mng/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common index 4d293c76496..5d7483cda2d 100644 --- a/x11/qt2-libs/Makefile.common +++ b/x11/qt2-libs/Makefile.common @@ -1,12 +1,11 @@ -# $NetBSD: Makefile.common,v 1.17 2001/10/09 19:51:41 tron Exp $ +# $NetBSD: Makefile.common,v 1.18 2002/08/25 18:40:43 jlam Exp $ # -DISTNAME= qt-x11-${QTVERSION} -WRKSRC= ${WRKDIR}/qt-${QTVERSION} -CATEGORIES= x11 -MASTER_SITES= \ - ftp://ftp.trolltech.com/qt/source/ \ - ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/ +DISTNAME= qt-x11-${QTVERSION} +WRKSRC= ${WRKDIR}/qt-${QTVERSION} +CATEGORIES= x11 +MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ + ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/ .include "../qt2/Makefile.common" @@ -38,7 +37,7 @@ PATCHDIR= ${.CURDIR}/../../x11/qt2-libs/patches .if ${OPSYS} == "SunOS" BUILD_DEPENDS+= egcs-1.1.2:../../lang/egcs -CONFIGURE_ENV+= CXX=${LOCALBASE}/egcs/bin/g++ +CXX= ${LOCALBASE}/egcs/bin/g++ CONFIGURE_ARGS+= -platform solaris-g++ .endif diff --git a/x11/qt2-libs/buildlink2.mk b/x11/qt2-libs/buildlink2.mk new file mode 100644 index 00000000000..9b4c199532e --- /dev/null +++ b/x11/qt2-libs/buildlink2.mk @@ -0,0 +1,33 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:43 jlam Exp $ + +.if !defined(QT2_LIBS_BUILDLINK2_MK) +QT2_LIBS_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= qt2-libs +BUILDLINK_DEPENDS.qt2-libs?= qt2-libs>=2.3.1nb2 +BUILDLINK_PKGSRCDIR.qt2-libs?= ../../x11/qt2-libs + +EVAL_PREFIX+= BUILDLINK_PREFIX.qt2-libs=qt2-libs +BUILDLINK_PREFIX.qt2-libs_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.qt2-libs+= qt2/include/*.h +BUILDLINK_FILES.qt2-libs+= qt2/lib/libqt.* + +QTDIR= ${BUILDLINK_PREFIX.qt2-libs}/qt2 + +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/mng/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" + +CONFIGURE_ENV+= QTDIR="${QTDIR}" +CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" +MAKE_ENV+= QTDIR="${QTDIR}" +MAKE_ENV+= MOC="${QTDIR}/bin/moc" +LDFLAGS+= -Wl,-R${QTDIR}/lib + +BUILDLINK_TARGETS+= qt2-libs-buildlink + +qt2-libs-buildlink: _BUILDLINK_USE + +.endif # QT2_LIBS_BUILDLINK2_MK diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo index f25c1e6cdcb..76d2db8cb34 100644 --- a/x11/qt2-libs/distinfo +++ b/x11/qt2-libs/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.6 2001/11/16 09:08:05 jlam Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 18:40:43 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) = 29254fdd872f763fb48512cbf982481b88e40e5b -SHA1 (patch-ac) = ce19f2f1dd839b86dda1de20268d380138c39415 +SHA1 (patch-ab) = cada94d79878a49e24211ab7d17c097bbf5a9794 +SHA1 (patch-ac) = c94b7b93e991f89fbfe6b3e0e142d825c7e16eac 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 e0f433c5120..fc467d58e57 100644 --- a/x11/qt2-libs/patches/patch-ab +++ b/x11/qt2-libs/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.7 2001/08/29 22:41:30 jlam Exp $ +$NetBSD: patch-ab,v 1.8 2002/08/25 18:40:44 jlam Exp $ --- configs/netbsd-g++-static.in.orig Wed Jun 13 04:56:48 2001 +++ configs/netbsd-g++-static.in @@ -14,10 +14,10 @@ $NetBSD: patch-ab,v 1.7 2001/08/29 22:41:30 jlam Exp $ # Compiling with support libraries -SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -+SYSCONF_CXXFLAGS_X11 = -I@BUILDLINK_X11_DIR@/include ++SYSCONF_CXXFLAGS_X11 = -I@X11BASE@/include SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include -SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include -+SYSCONF_CXXFLAGS_OPENGL = -I@BUILDLINK_DIR@/include -I@BUILDLINK_X11_DIR@/include ++SYSCONF_CXXFLAGS_OPENGL = -I@LOCALBASE@/include -I@X11BASE@/include # Compiling YACC output SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses @@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.7 2001/08/29 22:41:30 jlam Exp $ # Linking with support libraries # X11 -SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib -+SYSCONF_LFLAGS_X11 = -L@BUILDLINK_X11_DIR@/lib ++SYSCONF_LFLAGS_X11 = -L@X11BASE@/lib SYSCONF_LIBS_X11 = -lXext -lX11 -lm # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib @@ -41,7 +41,7 @@ $NetBSD: patch-ab,v 1.7 2001/08/29 22:41:30 jlam Exp $ SYSCONF_LIBS_QT_OPENGL = # OpenGL -SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -+SYSCONF_LFLAGS_OPENGL = -L@BUILDLINK_DIR@/lib -L@BUILDLINK_X11_DIR@/lib ++SYSCONF_LFLAGS_OPENGL = -L@LOCALBASE@/lib -L@X11BASE@/lib SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu # Yacc SYSCONF_LIBS_YACC = diff --git a/x11/qt2-libs/patches/patch-ac b/x11/qt2-libs/patches/patch-ac index 4ad0ebf9062..406bb05f400 100644 --- a/x11/qt2-libs/patches/patch-ac +++ b/x11/qt2-libs/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 jlam Exp $ +$NetBSD: patch-ac,v 1.5 2002/08/25 18:40:44 jlam Exp $ --- configs/solaris-g++-static.in.orig Wed Jun 13 04:56:50 2001 +++ configs/solaris-g++-static.in @@ -11,10 +11,10 @@ $NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 jlam Exp $ # Compiling with support libraries -SYSCONF_CXXFLAGS_X11 = -I/usr/openwin/include -+SYSCONF_CXXFLAGS_X11 = -I@BUILDLINK_X11_DIR@/include ++SYSCONF_CXXFLAGS_X11 = -I@X11BASE@/include SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include -SYSCONF_CXXFLAGS_OPENGL = -+SYSCONF_CXXFLAGS_OPENGL = -I@BUILDLINK_DIR@/include -I@BUILDLINK_X11_DIR@/include ++SYSCONF_CXXFLAGS_OPENGL = -I@LOCALBASE@/include -I@X11BASE@/include # Compiling YACC output SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses @@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 jlam Exp $ # Linking with support libraries # X11 -SYSCONF_LFLAGS_X11 = -L/usr/openwin/lib -+SYSCONF_LFLAGS_X11 = -L@BUILDLINK_X11_DIR@/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 @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 jlam Exp $ SYSCONF_LIBS_QT_OPENGL = # OpenGL -SYSCONF_LFLAGS_OPENGL = -+SYSCONF_LFLAGS_OPENGL = -L@BUILDLINK_DIR@/lib -L@BUILDLINK_X11_DIR@/lib ++SYSCONF_LFLAGS_OPENGL = -L@LOCALBASE@/lib -L@X11BASE@/lib SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu # Yacc SYSCONF_LIBS_YACC = diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 892a3f38dc3..df0ac57fbd6 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/08/08 16:17:08 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 18:40:44 jlam Exp $ # .include "../qt3-libs/Makefile.common" @@ -7,8 +7,7 @@ PKGNAME= qt3-libs-${QTVERSION} PKGREVISION= 2 COMMENT= C++ X GUI toolkit -USE_BUILDLINK_ONLY= yes -BUILDLINK_QTDIR= ${WRKSRC} +USE_BUILDLINK2= yes MAKE_ENV+= LIBQT="${WRKSRC}/lib/libqt-mt.la" @@ -26,7 +25,7 @@ do-install: ${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin ${INSTALL_DATA_DIR} ${QTPREFIX}/lib - ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqt-mt.la ${QTPREFIX}/lib + ${PKGLIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqt-mt.la ${QTPREFIX}/lib ${INSTALL_DATA_DIR} ${QTPREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/*.h ${QTPREFIX}/include ${INSTALL_DATA_DIR} ${QTPREFIX}/include/private @@ -36,12 +35,12 @@ do-install: ${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/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/Mesa/buildlink.mk" -.include "../../graphics/mng/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/freetype2/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/mng/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index fb69f91ff8f..87a405334a7 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,10 +1,9 @@ -# $NetBSD: Makefile.common,v 1.5 2002/05/29 19:09:55 skrll Exp $ +# $NetBSD: Makefile.common,v 1.6 2002/08/25 18:40:44 jlam Exp $ # -DISTNAME= qt-x11-free-${QTVERSION} -CATEGORIES= x11 -MASTER_SITES= \ - ftp://ftp.trolltech.com/qt/source/ \ - ftp://ftp.bero.org/pub/qt/source/ +DISTNAME= qt-x11-free-${QTVERSION} +CATEGORIES= x11 +MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ + ftp://ftp.bero.org/pub/qt/source/ .include "../qt3/Makefile.common" @@ -40,12 +39,15 @@ PATCHDIR= ${.CURDIR}/../../x11/qt3-libs/patches .if ${OPSYS} == "SunOS" BUILD_DEPENDS+= egcs-1.1.2:../../lang/egcs -CONFIGURE_ENV+= CXX=${LOCALBASE}/egcs/bin/g++ +CXX= ${LOCALBASE}/egcs/bin/g++ CONFIGURE_ARGS+= -platform solaris-g++ .endif post-patch: ${SED} \ + -e 's:@LOCALBASE@:${LOCALBASE}:g' \ + -e 's:@X11BASE@:${X11BASE}:g' \ + -e 's:@X11PREFIX@:${X11PREFIX}:g' \ -e 's:@CC@:${CC}:g' \ -e 's:@CXX@:${CXX}:g' \ -e 's:@LDFLAGS@:${LDFLAGS}:g' \ @@ -53,9 +55,7 @@ post-patch: -e 's:@CXXFLAGS@:${CXXFLAGS}:g' \ -e 's:@LEX@:${LEX}:g' \ -e 's:@YACC@:${YACC}:g' \ - -e 's:@LIBTOOL@:${LIBTOOL}:g' \ - -e 's:@BUILDLINK_DIR@:${BUILDLINK_DIR}:g' \ - -e 's:@BUILDLINK_X11_DIR@:${BUILDLINK_X11_DIR}:g' \ + -e 's:@LIBTOOL@:${PKGLIBTOOL}:g' \ ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf for dir in ${WRKSRC}/mkspecs/*; do \ ${CP} ${WRKSRC}/qmake.conf $${dir}; \ diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST index 340b89691ed..d21cbf55150 100644 --- a/x11/qt3-libs/PLIST +++ b/x11/qt3-libs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/05/29 19:09:55 skrll Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/08/25 18:40:45 jlam Exp $ qt3/bin/moc qt3/include/jri.h qt3/include/jri_md.h diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk new file mode 100644 index 00000000000..1b8441de487 --- /dev/null +++ b/x11/qt3-libs/buildlink2.mk @@ -0,0 +1,34 @@ +# $NetBSD + +.if !defined(QT3_LIBS_BUILDLINK2_MK) +QT3_LIBS_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= qt3-libs +BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.0.4nb2 +BUILDLINK_PKGSRCDIR.qt3-libs?= ../../x11/qt3-libs + +EVAL_PREFIX+= BUILDLINK_PREFIX.qt3-libs=qt3-libs +BUILDLINK_PREFIX.qt3-libs_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.qt3-libs+= qt3/include/*.h +BUILDLINK_FILES.qt3-libs+= qt3/include/private/*.h +BUILDLINK_FILES.qt3-libs+= qt3/lib/libqt-mt.* + +QTDIR= ${BUILDLINK_PREFIX.qt3-libs}/qt3 + +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/mng/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" + +CONFIGURE_ENV+= QTDIR="${QTDIR}" +CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" +MAKE_ENV+= QTDIR="${QTDIR}" +MAKE_ENV+= MOC="${QTDIR}/bin/moc" +LDFLAGS+= -Wl,-R${QTDIR}/lib + +BUILDLINK_TARGETS+= qt3-libs-buildlink + +qt3-libs-buildlink: _BUILDLINK_USE + +.endif # QT3_LIBS_BUILDLINK2_MK diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index 534207eed7d..61de67c9423 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/05/30 12:33:26 skrll Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 18:40:46 jlam Exp $ SHA1 (qt-x11-free-3.0.4.tar.gz) = 1bed903c622009fbbcce8386bb1b48b4202f3dbb Size (qt-x11-free-3.0.4.tar.gz) = 15198015 bytes diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index 0e0c274971d..edbd31989f1 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ -# -# $Id: qmake.conf,v 1.3 2002/05/30 12:33:27 skrll Exp $ +# $NetBSD: qmake.conf,v 1.4 2002/08/25 18:40:46 jlam Exp $ +# $Id: qmake.conf,v 1.4 2002/08/25 18:40:46 jlam Exp $ # # qmake configuration for netbsd-g++ # @@ -32,14 +32,14 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_INCDIR = @BUILDLINK_DIR@/include -QMAKE_LIBDIR = @BUILDLINK_DIR@/lib -QMAKE_INCDIR_X11 = @BUILDLINK_X11_DIR@/include -QMAKE_LIBDIR_X11 = @BUILDLINK_X11_DIR@/lib +QMAKE_INCDIR = @LOCALBASE@/include +QMAKE_LIBDIR = @LOCALBASE@/lib +QMAKE_INCDIR_X11 = @X11BASE@/include +QMAKE_LIBDIR_X11 = @X11BASE@/lib QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib -QMAKE_INCDIR_OPENGL = @BUILDLINK_DIR@/include -QMAKE_LIBDIR_OPENGL = @BUILDLINK_DIR@/lib +QMAKE_INCDIR_OPENGL = @X11PREFIX@/include +QMAKE_LIBDIR_OPENGL = @X11PREFIX@/lib QMAKE_LINK = @LIBTOOL@ --mode=link @CXX@ QMAKE_LINK_SHLIB_CMD = \ diff --git a/x11/qt3-libs/patches/patch-aa b/x11/qt3-libs/patches/patch-aa index e52c4f01b2a..3983e6e2cab 100644 --- a/x11/qt3-libs/patches/patch-aa +++ b/x11/qt3-libs/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2002/05/30 12:33:27 skrll Exp $ +$NetBSD: patch-aa,v 1.5 2002/08/25 18:40:47 jlam Exp $ --- Makefile.orig Thu May 30 09:42:36 2002 +++ Makefile diff --git a/x11/qt3-libs/patches/patch-ad b/x11/qt3-libs/patches/patch-ad index c00ab0b972f..241ef83148f 100644 --- a/x11/qt3-libs/patches/patch-ad +++ b/x11/qt3-libs/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2002/05/29 19:09:56 skrll Exp $ +$NetBSD: patch-ad,v 1.2 2002/08/25 18:40:47 jlam Exp $ --- src/kernel/qthread_unix.cpp.orig Fri May 24 16:43:12 2002 +++ src/kernel/qthread_unix.cpp diff --git a/x11/tk/Makefile b/x11/tk/Makefile index 116f8eae19e..c2e7acf3edf 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/03/20 17:38:23 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2002/08/25 18:40:48 jlam Exp $ DISTNAME= tk8.3.4 PKGNAME= tk-8.3.4 @@ -12,13 +12,12 @@ COMMENT= Graphical toolkit for TCL WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib MAKE_ENV+= TOUCH="${TOUCH}" USE_X11= yes USE_LIBTOOL= yes -USE_BUILDLINK_ONLY= yes -REPLACE_BUILDLINK+= tkConfig.sh +USE_BUILDLINK2= yes # Initially install the man pages into ${WRKDIR}/man, as we need a staged # install to avoid overwriting existing manpages in ${PREFIX}/man. @@ -87,6 +86,5 @@ post-install: test: cd ${WRKSRC}; ${SETENV} LIBTOOL=${LIBTOOL} PREFIX=${PREFIX} ${MAKE} test -.include "../../lang/tcl/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../lang/tcl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk/buildlink2.mk b/x11/tk/buildlink2.mk new file mode 100644 index 00000000000..fda29966ba8 --- /dev/null +++ b/x11/tk/buildlink2.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:48 jlam Exp $ + +.if !defined(TK_BUILDLINK2_MK) +TK_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= tk +BUILDLINK_DEPENDS.tk?= tk>=8.3.4 +BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk + +EVAL_PREFIX+= BUILDLINK_PREFIX.tk=tk +BUILDLINK_PREFIX.tk_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.tk= include/tk.h +BUILDLINK_FILES.tk+= include/tkDecls.h +BUILDLINK_FILES.tk+= include/tkPlatDecls.h +BUILDLINK_FILES.tk+= include/tkIntXlibDecls.h +BUILDLINK_FILES.tk+= include/tk/*/*.h +BUILDLINK_FILES.tk+= lib/libtk83.* +BUILDLINK_FILES.tk+= lib/libtkstub83.* + +.include "../../lang/tcl/buildlink2.mk" + +BUILDLINK_TARGETS+= tk-buildlink + +tk-buildlink: _BUILDLINK_USE + +.endif # TK_BUILDLINK2_MK diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile index 74a351568dc..15ca6ca8588 100644 --- a/x11/wxGTK/Makefile +++ b/x11/wxGTK/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/03/13 17:38:04 fredb Exp $ +# $NetBSD: Makefile,v 1.15 2002/08/25 18:40:49 jlam Exp $ # DISTNAME= wxGTK-2.2.7 @@ -10,7 +10,8 @@ MAINTAINER= tsarna@netbsd.org HOMEPAGE= http://www.freiburg.linux.de/~wxxt/ COMMENT= GTK-based implementation of the wxWindows GUI library -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined +USE_X11= # defined USE_GMAKE= # defined USE_LIBTOOL= # defined GNU_CONFIGURE= # defined @@ -31,9 +32,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE ${INSTALL_DATA} ${WRKSRC}/SYMBOLS.txt ${DOCDIR}/SYMBOLS -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/wxGTK/buildlink2.mk b/x11/wxGTK/buildlink2.mk new file mode 100644 index 00000000000..879a356ab29 --- /dev/null +++ b/x11/wxGTK/buildlink2.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:49 jlam Exp $ + +.if !defined(WXGTK_BUILDLINK2_MK) +WXGTK_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= wxGTK +BUILDLINK_DEPENDS.wxGTK?= wxGTK>=2.2.7nb1 +BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK + +EVAL_PREFIX+= BUILDLINK_PREFIX.wxGTK=wxGTK +BUILDLINK_PREFIX.wxGTK_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.wxGTK= include/wx/* +BUILDLINK_FILES.wxGTK+= include/wx/*/* +BUILDLINK_FILES.wxGTK+= lib/wx/include/wx/gtk/* +BUILDLINK_FILES.wxGTK+= lib/libwx_gtk.* + +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + +BUILDLINK_TARGETS+= wxGTK-buildlink + +wxGTK-buildlink: _BUILDLINK_USE + +.endif # WXGTK_BUILDLINK2_MK diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile index 4daba9a4b56..34227a1770c 100644 --- a/x11/xview-config/Makefile +++ b/x11/xview-config/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/11/29 01:12:53 hubertf Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/25 18:40:50 jlam Exp $ # $FreeBSD Id: Makefile,v 1.9 1998/05/04 03:34:50 steve Exp # @@ -15,6 +15,8 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL EXTRACT_ELEMENTS= ${DISTNAME}/config WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS} + +USE_BUILDLINK2= # defined USE_IMAKE= # defined post-extract: diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile index 1c52e8bf66c..9250472d82e 100644 --- a/x11/xview-lib/Makefile +++ b/x11/xview-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/04/10 04:49:58 seb Exp $ +# $NetBSD: Makefile,v 1.20 2002/08/25 18:40:50 jlam Exp $ # $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp # @@ -17,6 +17,7 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL # builds, but binaries in../xview-clients all crash NOT_FOR_PLATFORM= *-*-alpha +USE_BUILDLINK2= # defined USE_IMAKE= # defined post-install: diff --git a/x11/xview-lib/buildlink2.mk b/x11/xview-lib/buildlink2.mk new file mode 100644 index 00000000000..03ea1955dc3 --- /dev/null +++ b/x11/xview-lib/buildlink2.mk @@ -0,0 +1,27 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:50 jlam Exp $ + +.if !defined(XVIEW_BUILDLINK2_MK) +XVIEW_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= xview +BUILDLINK_DEPENDS.xview?= xview-lib>=3.2.1 +BUILDLINK_PKGSRCDIR.xview?= ../../x11/xview-lib + +EVAL_PREFIX+= BUILDLINK_PREFIX.xview=xview-lib +BUILDLINK_PREFIX.xview_DEFAULT= ${X11PREFIX} + +BUILDLINK_FILES.xview= include/bitmaps/* +BUILDLINK_FILES.xview+= include/images/* +BUILDLINK_FILES.xview+= include/olgx/* +BUILDLINK_FILES.xview+= include/olgx_private/* +BUILDLINK_FILES.xview+= include/pixrect/* +BUILDLINK_FILES.xview+= include/xview/* +BUILDLINK_FILES.xview+= include/xview_private/* +BUILDLINK_FILES.xview+= lib/libolgx.* +BUILDLINK_FILES.xview+= lib/libxview.* + +BUILDLINK_TARGETS+= xview-buildlink + +xview-buildlink: _BUILDLINK_USE + +.endif # XVIEW_BUILDLINK2_MK |