From 63fc151cb9f15f8bcc66bbeca21050fea30c29d3 Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 29 Aug 2001 22:41:00 +0000 Subject: Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references to ${X11BASE} in the header and library search paths into references to ${LOCALBASE}/share/x11-links. These packages should now be strongly- buildlinked regardless of whether xpkgwedge is installed. Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge. --- x11/ebuilder/Makefile | 4 ++-- x11/ebuilder/distinfo | 4 ++-- x11/ebuilder/patches/patch-aa | 4 ++-- x11/eterm/Makefile | 3 ++- x11/eterm/distinfo | 5 ++++- x11/eterm/patches/patch-ae | 13 +++++++++++++ x11/eterm/patches/patch-af | 15 +++++++++++++++ x11/eterm/patches/patch-ag | 21 +++++++++++++++++++++ x11/fltk/Makefile | 3 ++- x11/gnome-libs/Makefile | 3 ++- x11/gtk/Makefile | 5 +++-- x11/imwheel/Makefile | 9 +++++---- x11/lesstif/Makefile | 3 ++- x11/lesstif12/Makefile | 3 ++- x11/qt2-libs/Makefile | 3 ++- x11/qt2-libs/Makefile.common | 3 ++- x11/qt2-libs/distinfo | 6 +++--- x11/qt2-libs/patches/patch-ab | 10 +++++----- x11/qt2-libs/patches/patch-ac | 10 +++++----- x11/qwt/Makefile | 3 ++- x11/qwt/distinfo | 4 ++-- x11/qwt/patches/patch-aa | 4 ++-- x11/rxvt/Makefile | 6 ++++-- x11/wmessage/Makefile | 4 ++-- x11/wmfire/Makefile | 7 +++---- x11/wmweather/Makefile | 3 ++- x11/xpenguins/Makefile | 7 +++---- x11/xpmroot/Makefile | 3 ++- x11/xteddy/Makefile | 6 +++--- x11/xteddy/distinfo | 4 ++-- x11/xteddy/patches/patch-aa | 13 +++++++++---- x11/xteddy2/Makefile | 6 ++---- 32 files changed, 132 insertions(+), 65 deletions(-) create mode 100644 x11/eterm/patches/patch-ae create mode 100644 x11/eterm/patches/patch-af create mode 100644 x11/eterm/patches/patch-ag (limited to 'x11') diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index 693ab7ba1c6..c06a3806315 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/06/26 19:54:48 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:27 jlam Exp $ # DISTNAME= ebuilder-0.56d @@ -11,7 +11,6 @@ HOMEPAGE= http://web.inter.nl.net/users/eavdmeer/index.html COMMENT= GUI builder for the Qt library USE_BUILDLINK_ONLY= yes -USE_X11= yes USE_GMAKE= yes MAKEFILE= GNUmakefile @@ -21,4 +20,5 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/ebuilder/distinfo b/x11/ebuilder/distinfo index da8e601e4a1..01949730a8c 100644 --- a/x11/ebuilder/distinfo +++ b/x11/ebuilder/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/06/26 19:54:48 jlam Exp $ +$NetBSD: distinfo,v 1.4 2001/08/29 22:41:27 jlam Exp $ SHA1 (ebuilder-0.56d.tar.gz) = fb0c7d56a7c55580082a832be975d188fe0e5e5d Size (ebuilder-0.56d.tar.gz) = 84717 bytes -SHA1 (patch-aa) = 906ee4003691e821b386cdcd6ccdd56777f7872d +SHA1 (patch-aa) = e3c24bd15a8942b2ce3573ecb5560ecfe5e39174 SHA1 (patch-ab) = a50121d2072e2c756432c4e0bfd44c6a2683498a diff --git a/x11/ebuilder/patches/patch-aa b/x11/ebuilder/patches/patch-aa index 0c6d17addfb..39217df8e4a 100644 --- a/x11/ebuilder/patches/patch-aa +++ b/x11/ebuilder/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/06/26 19:54:49 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2001/08/29 22:41:27 jlam Exp $ --- config.mk.orig Sat Mar 25 08:31:45 2000 +++ config.mk @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.3 2001/06/26 19:54:49 jlam Exp $ QTINCL = -I$(QTDIR)/include QTCC = $(QTDIR)/bin/moc -QTLIBS = -L$(QTDIR)/lib -lqt -+QTLIBS = ${LDFLAGS} -L$(QTDIR)/lib -lqt -L$(X11BASE)/lib -lX11 -lXext -lSM -lpng -lz ++QTLIBS = ${LDFLAGS} -L$(QTDIR)/lib -lqt -L$(BUILDLINK_X11_DIR)/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/eterm/Makefile b/x11/eterm/Makefile index 4cefb7d825e..144869e24e8 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/06/26 13:40:43 zuntum Exp $ +# $NetBSD: Makefile,v 1.11 2001/08/29 22:41:27 jlam Exp $ DISTNAME= Eterm-0.8.10 PKGNAME= eterm-0.8.10 @@ -42,4 +42,5 @@ post-install: .endif .include "../../graphics/imlib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo index 74e57f86c1d..161d5ac02e4 100644 --- a/x11/eterm/distinfo +++ b/x11/eterm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/04/28 11:07:34 zuntum Exp $ +$NetBSD: distinfo,v 1.4 2001/08/29 22:41:27 jlam Exp $ SHA1 (Eterm-0.8.10.tar.gz) = 0cafeec2c9d79c874c6b312dcb105b912168ad0d Size (Eterm-0.8.10.tar.gz) = 593026 bytes @@ -12,3 +12,6 @@ SHA1 (patch-aa) = 056585ad4c39b60a3dbf41d8c7e65d31ba5f7fcd SHA1 (patch-ab) = cdea7fe7a3c546e9f89a7eb86ec079f34572e984 SHA1 (patch-ac) = 26b0f5c13f2b621db1c5edf84c5123b315225d8d SHA1 (patch-ad) = a750146fe3a0b0b2796997cf2e20e38f14be86bf +SHA1 (patch-ae) = 7464d0b7b4b8d5b4c825d7fdcfa464b5e3d18a6c +SHA1 (patch-af) = 8f21b197a56ddc0d66f29dcf9d5dcbe7922a28ae +SHA1 (patch-ag) = 5359f122eb6fe605202288de59d71d07be4d2556 diff --git a/x11/eterm/patches/patch-ae b/x11/eterm/patches/patch-ae new file mode 100644 index 00000000000..792bb622c18 --- /dev/null +++ b/x11/eterm/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.3 2001/08/29 22:41:28 jlam Exp $ + +--- libmej/Makefile.in.orig Fri Nov 5 11:03:53 1999 ++++ libmej/Makefile.in +@@ -105,7 +105,7 @@ + + libmej_la_SOURCES = debug.c mem.c strings.c snprintf.c + +-INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS) ++INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I.. $(X_CFLAGS) + + libmej_la_LDFLAGS = -release $(VERSION) + diff --git a/x11/eterm/patches/patch-af b/x11/eterm/patches/patch-af new file mode 100644 index 00000000000..782a96609b5 --- /dev/null +++ b/x11/eterm/patches/patch-af @@ -0,0 +1,15 @@ +$NetBSD: patch-af,v 1.1 2001/08/29 22:41:28 jlam Exp $ + +--- src/Makefile.in.orig Fri Nov 5 14:03:54 1999 ++++ src/Makefile.in +@@ -113,8 +113,8 @@ + Eterm_DEPENDENCIES = libEterm.la + Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir) libEterm.la + +-INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS) +-LDADD = $(DIST_ROOT)/libmej/libmej.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS) ++INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/libmej -I.. $(X_CFLAGS) ++LDADD = $(DIST_ROOT)/libmej/libmej.la $(LIBS) $(GRLIBS) $(X_LIBS) + + EXTRA_DIST = activeconfig.h activeeterm.h activetags.h command.h debug.h eterm_imlib.h eterm_utmp.h feature.h.in graphics.h grkelot.h grx.h main.h menubar.h misc.h options.h pixmap.h profile.h screen.h scrollbar.h system.h threads.h graphics/Makefile.am graphics/Makefile.in graphics/README graphics/data graphics/grxlib.c graphics/grxlib.h graphics/qplot.c Eterm.xpm + diff --git a/x11/eterm/patches/patch-ag b/x11/eterm/patches/patch-ag new file mode 100644 index 00000000000..0a5e32b2a7b --- /dev/null +++ b/x11/eterm/patches/patch-ag @@ -0,0 +1,21 @@ +$NetBSD: patch-ag,v 1.1 2001/08/29 22:41:28 jlam Exp $ + +--- utils/Makefile.in.orig Fri Nov 5 14:03:55 1999 ++++ utils/Makefile.in +@@ -101,14 +101,14 @@ + THREADLIBS = @THREADLIBS@ + VERSION = @VERSION@ + +-INCLUDES = -I. -I../libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS) ++INCLUDES = -I. -I../libmej -I.. $(X_CFLAGS) + + bin_PROGRAMS = Esetroot Etbg + bin_SCRIPTS = Etcolors.sh Etmenu.sh + + Esetroot_SOURCES = Esetroot.c + Esetroot_LDFLAGS = -rpath $(libdir):$(pkglibdir) +-Esetroot_LDADD = -L$(DIST_ROOT)/libmej -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS) ++Esetroot_LDADD = -L$(DIST_ROOT)/libmej $(LIBS) $(GRLIBS) $(X_LIBS) + + Etbg_SOURCES = Etbg.c + diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 93ffe225889..c75d351813b 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/06/20 21:17:36 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2001/08/29 22:41:28 jlam Exp $ # DISTNAME= ${PKGNAME}-source @@ -31,4 +31,5 @@ test: ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test .include "../../graphics/Mesa/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 62f83f58cd9..3c2d729dbf0 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2001/06/29 04:54:56 jlam Exp $ +# $NetBSD: Makefile,v 1.68 2001/08/29 22:41:28 jlam Exp $ DISTNAME= gnome-libs-1.2.13 CATEGORIES= x11 gnome @@ -71,4 +71,5 @@ post-install: .include "../../graphics/xpm/buildlink.mk" .include "../../net/ORBit/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 0c26238acf0..1796444c20f 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2001/06/29 04:54:56 jlam Exp $ +# $NetBSD: Makefile,v 1.65 2001/08/29 22:41:29 jlam Exp $ DISTNAME= gtk+-1.2.10 CATEGORIES= x11 @@ -34,7 +34,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${X11BASE}/lib +X_LDFLAGS= -Wl,-R${X11BASE}/lib -L${BUILDLINK_X11_DIR}/lib GTK_VERSION= ${DISTNAME:S/gtk+-//} GTK_MAJOR_VERSION= ${GTK_VERSION:C/\..*//} @@ -66,4 +66,5 @@ post-install: .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/glib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile index 8771474aa0d..1295ea3eeca 100644 --- a/x11/imwheel/Makefile +++ b/x11/imwheel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/06/30 21:12:24 zuntum Exp $ +# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:29 jlam Exp $ # DISTNAME= imwheel-0.9.9 @@ -10,9 +10,10 @@ HOMEPAGE= http://jcatki.dhs.org/imwheel/ COMMENT= tool which helps to use mousewheels USE_BUILDLINK_ONLY= YES -GNU_CONFIGURE= YES -USE_X11BASE= YES +GNU_CONFIGURE= YES +USE_X11BASE= YES -CONFIGURE_ARGS+=--disable-gpm +CONFIGURE_ARGS+= --disable-gpm +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index d0671260af2..82f45ebc7e1 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2001/08/08 07:37:51 jlam Exp $ +# $NetBSD: Makefile,v 1.58 2001/08/29 22:41:29 jlam Exp $ .include "../../x11/lesstif/Makefile.common" @@ -28,4 +28,5 @@ 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/lesstif12/Makefile b/x11/lesstif12/Makefile index 47dc9826052..46f1c252ef8 100644 --- a/x11/lesstif12/Makefile +++ b/x11/lesstif12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/30 19:08:22 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/08/29 22:41:29 jlam Exp $ .include "../../x11/lesstif/Makefile.common" @@ -21,4 +21,5 @@ 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/qt2-libs/Makefile b/x11/qt2-libs/Makefile index 9e8b0832ad3..fd7308a0f51 100644 --- a/x11/qt2-libs/Makefile +++ b/x11/qt2-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/06/23 19:35:27 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:29 jlam Exp $ # #USE_MESA= yes @@ -30,4 +30,5 @@ do-install: .include "../../graphics/Mesa/buildlink.mk" .include "../../graphics/mng/buildlink.mk" .include "../../graphics/png/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common index 15af1ef9ce8..a1e18ed2f59 100644 --- a/x11/qt2-libs/Makefile.common +++ b/x11/qt2-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2001/06/23 19:35:27 jlam Exp $ +# $NetBSD: Makefile.common,v 1.16 2001/08/29 22:41:29 jlam Exp $ # DISTNAME= qt-x11-${QTVERSION} @@ -43,6 +43,7 @@ CONFIGURE_ARGS+= -platform solaris-g++ .endif FILES_SUBST= BUILDLINK_DIR=${BUILDLINK_DIR} +FILES_SUBST+= BUILDLINK_X11_DIR=${BUILDLINK_X11_DIR} FILES_SUBST+= LOCALBASE=${LOCALBASE} FILES_SUBST+= QTDIR=${QTPREFIX} FILES_SUBST+= X11BASE=${X11BASE} diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo index 5c212303bf1..7885500ad92 100644 --- a/x11/qt2-libs/distinfo +++ b/x11/qt2-libs/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.4 2001/06/23 19:35:27 jlam Exp $ +$NetBSD: distinfo,v 1.5 2001/08/29 22:41:29 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) = 7f1cdc853e036f17fee51402756f68504c413d00 -SHA1 (patch-ac) = 25cbb7d243dc2c543b44d2870325d017b26604b0 +SHA1 (patch-ab) = 29254fdd872f763fb48512cbf982481b88e40e5b +SHA1 (patch-ac) = ce19f2f1dd839b86dda1de20268d380138c39415 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 8992d2de3a6..e0f433c5120 100644 --- a/x11/qt2-libs/patches/patch-ab +++ b/x11/qt2-libs/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.6 2001/06/23 19:35:27 jlam Exp $ +$NetBSD: patch-ab,v 1.7 2001/08/29 22:41:30 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.6 2001/06/23 19:35:27 jlam Exp $ # Compiling with support libraries -SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -+SYSCONF_CXXFLAGS_X11 = -I@X11BASE@/include ++SYSCONF_CXXFLAGS_X11 = -I@BUILDLINK_X11_DIR@/include SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include -SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include -+SYSCONF_CXXFLAGS_OPENGL = -I@BUILDLINK_DIR@/include -I@X11BASE@/include ++SYSCONF_CXXFLAGS_OPENGL = -I@BUILDLINK_DIR@/include -I@BUILDLINK_X11_DIR@/include # Compiling YACC output SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses @@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.6 2001/06/23 19:35:27 jlam Exp $ # Linking with support libraries # X11 -SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib -+SYSCONF_LFLAGS_X11 = -L@X11BASE@/lib ++SYSCONF_LFLAGS_X11 = -L@BUILDLINK_X11_DIR@/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.6 2001/06/23 19:35:27 jlam Exp $ SYSCONF_LIBS_QT_OPENGL = # OpenGL -SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -+SYSCONF_LFLAGS_OPENGL = -L@BUILDLINK_DIR@/lib -L@X11BASE@/lib ++SYSCONF_LFLAGS_OPENGL = -L@BUILDLINK_DIR@/lib -L@BUILDLINK_X11_DIR@/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 1e230e7010b..4ad0ebf9062 100644 --- a/x11/qt2-libs/patches/patch-ac +++ b/x11/qt2-libs/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2001/06/23 19:35:27 jlam Exp $ +$NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 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.3 2001/06/23 19:35:27 jlam Exp $ # Compiling with support libraries -SYSCONF_CXXFLAGS_X11 = -I/usr/openwin/include -+SYSCONF_CXXFLAGS_X11 = -I@X11BASE@/include ++SYSCONF_CXXFLAGS_X11 = -I@BUILDLINK_X11_DIR@/include SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include -SYSCONF_CXXFLAGS_OPENGL = -+SYSCONF_CXXFLAGS_OPENGL = -I@BUILDLINK_DIR@/include -I@X11BASE@/include ++SYSCONF_CXXFLAGS_OPENGL = -I@BUILDLINK_DIR@/include -I@BUILDLINK_X11_DIR@/include # Compiling YACC output SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses @@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.3 2001/06/23 19:35:27 jlam Exp $ # Linking with support libraries # X11 -SYSCONF_LFLAGS_X11 = -L/usr/openwin/lib -+SYSCONF_LFLAGS_X11 = -L@X11BASE@/lib ++SYSCONF_LFLAGS_X11 = -L@BUILDLINK_X11_DIR@/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.3 2001/06/23 19:35:27 jlam Exp $ SYSCONF_LIBS_QT_OPENGL = # OpenGL -SYSCONF_LFLAGS_OPENGL = -+SYSCONF_LFLAGS_OPENGL = -L@BUILDLINK_DIR@/lib -L@X11BASE@/lib ++SYSCONF_LFLAGS_OPENGL = -L@BUILDLINK_DIR@/lib -L@BUILDLINK_X11_DIR@/lib SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu # Yacc SYSCONF_LIBS_YACC = diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile index 8480a8084de..a37c5456329 100644 --- a/x11/qwt/Makefile +++ b/x11/qwt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/06/26 20:42:59 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/08/29 22:41:30 jlam Exp $ DISTNAME= qwt-0.3.0 CATEGORIES= x11 @@ -31,4 +31,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3 .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qwt/distinfo b/x11/qwt/distinfo index 009b3d74ce3..2b8a6c39b3d 100644 --- a/x11/qwt/distinfo +++ b/x11/qwt/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.4 2001/06/26 20:42:59 jlam Exp $ +$NetBSD: distinfo,v 1.5 2001/08/29 22:41:30 jlam Exp $ SHA1 (qwt-0.3.0.tar.gz) = 504940fbf25b058d258bba3589a22752a624847b Size (qwt-0.3.0.tar.gz) = 484675 bytes -SHA1 (patch-aa) = e57c888c1c6ea486dfa24e84e7aaba72f406fa7e +SHA1 (patch-aa) = 37b74054101d51f1e60acd6afad1a128eb6b867d diff --git a/x11/qwt/patches/patch-aa b/x11/qwt/patches/patch-aa index 4561293d5a9..a5c62893227 100644 --- a/x11/qwt/patches/patch-aa +++ b/x11/qwt/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2001/06/26 20:43:00 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:30 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.2 2001/06/26 20:43:00 jlam Exp $ -LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm +#LINK = g++ +#LFLAGS = -Bshareable -+LIBS = ${LDFLAGS} $(SUBLIBS) -L$(QTDIR)/lib -L${X11BASE}/lib -lqt -lXext -lX11 -lm ++LIBS = ${LDFLAGS} $(SUBLIBS) -L$(QTDIR)/lib -L${BUILDLINK_X11_DIR}/lib -lqt -lXext -lX11 -lm AR = ar cqs RANLIB = MOC = $(QTDIR)/bin/moc diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index 950cf2ddb3e..19bf333b946 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/08/06 06:09:55 martin Exp $ +# $NetBSD: Makefile,v 1.27 2001/08/29 22:41:30 jlam Exp $ # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp # @@ -40,7 +40,8 @@ CONFIGURE_ARGS+= --enable-utmp \ # enabling it, please fix pkg/MESSAGE as well. # --enable-greek -CPPFLAGS+= -I${BUILDLINK_DIR}/include/X11 +CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_DIR}/include/X11 +CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_DIR}/lib post-patch: ${MV} ${WRKSRC}/src/feature.h ${WRKSRC}/src/feature.h.orig @@ -53,4 +54,5 @@ pre-install: fi .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile index ba9d416b694..bbd7b807250 100644 --- a/x11/wmessage/Makefile +++ b/x11/wmessage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/07/24 09:41:16 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:31 jlam Exp $ DISTNAME= wmessage-0.10 CATEGORIES= x11 @@ -8,8 +8,8 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.ozemail.com.au/~crn/wmessage/ COMMENT= WINGs based message viewer similar to xmessage -USE_X11= yes USE_BUILDLINK_ONLY= yes .include "../../wm/windowmaker/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile index fec59d171be..dfed1494c35 100644 --- a/x11/wmfire/Makefile +++ b/x11/wmfire/Makefile @@ -1,4 +1,4 @@ -#$NetBSD: Makefile,v 1.7 2001/06/29 08:51:20 zuntum Exp $ +#$NetBSD: Makefile,v 1.8 2001/08/29 22:41:31 jlam Exp $ # DISTNAME= wmfire-0.0.3.8 @@ -9,9 +9,7 @@ MAINTAINER= hubertf@netbsd.org COMMENT= Displays generated fire according to system load USE_BUILDLINK_ONLY= YES -USE_X11= YES -GNU_CONFIGURE= YES -CPPFLAGS+= -I${X11BASE}/include +GNU_CONFIGURE= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmfire @@ -22,4 +20,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/wmfire .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile index a8e8ec42d48..324161fe962 100644 --- a/x11/wmweather/Makefile +++ b/x11/wmweather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/07/15 14:03:12 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:31 jlam Exp $ # DISTNAME= wmWeather-1.31 @@ -18,4 +18,5 @@ REPLACE_PERL= GrabWeather CPPFLAGS+= -I${X11BASE}/include .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile index 92cdf5b20b6..a47612f0578 100644 --- a/x11/xpenguins/Makefile +++ b/x11/xpenguins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/07/09 15:40:41 zuntum Exp $ +# $NetBSD: Makefile,v 1.8 2001/08/29 22:41:31 jlam Exp $ # DISTNAME= xpenguins-2.1 @@ -10,9 +10,8 @@ HOMEPAGE= http://xpenguins.seul.org/ COMMENT= Little penguins walking along the tops of your windows USE_BUILDLINK_ONLY= YES -USE_X11= YES - -GNU_CONFIGURE= YES +GNU_CONFIGURE= YES .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile index d45bfb5549b..05b903822ce 100644 --- a/x11/xpmroot/Makefile +++ b/x11/xpmroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/07/10 17:51:14 nra Exp $ +# $NetBSD: Makefile,v 1.18 2001/08/29 22:41:31 jlam Exp $ # DISTNAME= fvwm-${PKG_VERSION} @@ -32,4 +32,5 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/utils/xpmroot.1 ${PREFIX}/man/man1 .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile index 95812e32efc..56568ad88a2 100644 --- a/x11/xteddy/Makefile +++ b/x11/xteddy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/07/09 15:43:14 zuntum Exp $ +# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:32 jlam Exp $ DISTNAME= xteddy-1.1 CATEGORIES= x11 games @@ -9,12 +9,12 @@ HOMEPAGE= http://www.ITN.LiU.SE/~stegu/xteddy COMMENT= Xteddy is a cuddly teddy bear for your X Windows desktop USE_BUILDLINK_ONLY= YES -USE_X11= YES -GNU_CONFIGURE= YES +GNU_CONFIGURE= YES pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy ${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy/pixmaps .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xteddy/distinfo b/x11/xteddy/distinfo index fb0c257fd92..6c29fe8263c 100644 --- a/x11/xteddy/distinfo +++ b/x11/xteddy/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:08:00 skrll Exp $ +$NetBSD: distinfo,v 1.3 2001/08/29 22:41:32 jlam Exp $ SHA1 (xteddy-1.1.tar.gz) = a681923333a4e2b2112290d601c167fd7e8e1302 Size (xteddy-1.1.tar.gz) = 117141 bytes -SHA1 (patch-aa) = 335b204442c48616121e6d7d82ffa0ae5b6f9199 +SHA1 (patch-aa) = d90f5121cfdbb28f8a1eb960c405c460de163430 SHA1 (patch-ab) = 260f836f4aab651c72caebac821e497b54d72cbd diff --git a/x11/xteddy/patches/patch-aa b/x11/xteddy/patches/patch-aa index aa4e702d0b8..ae1789c3dc7 100644 --- a/x11/xteddy/patches/patch-aa +++ b/x11/xteddy/patches/patch-aa @@ -1,8 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/10/15 01:01:46 hubertf Exp $ +$NetBSD: patch-aa,v 1.2 2001/08/29 22:41:32 jlam Exp $ ---- Makefile.in.orig Fri Oct 15 02:30:18 1999 -+++ Makefile.in Fri Oct 15 02:31:37 1999 -@@ -74,7 +74,7 @@ +--- Makefile.in.orig Thu Oct 29 03:01:17 1998 ++++ Makefile.in +@@ -70,11 +70,11 @@ + xteddy_SOURCES = xteddy.c + HTML_DOC = html/xteddy.html html/xteddy_info.html \ + html/images/noise.jpg html/images/xteddy.gif html/images/xteddy.xbm +-xteddy_LDADD = -L/usr/X11R6/lib ++xteddy_LDADD = -L${BUILDLINK_X11_DIR} LIBS = -lX11 -lXext -lXpm man_MANS = xteddy.1 diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile index 402fd1d230f..007708d17cb 100644 --- a/x11/xteddy2/Makefile +++ b/x11/xteddy2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/08/23 04:58:04 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:32 jlam Exp $ DISTNAME= xteddy-2.0.1 CATEGORIES= x11 games @@ -12,9 +12,6 @@ CONFLICT+= xteddy-1.* USE_BUILDLINK_ONLY= yes GNU_CONFIGURE= yes -USE_X11= yes - -CPPFLAGS+= -I${X11BASE}/include pre-configure: files="configure xteddy_test xtoys"; \ @@ -29,4 +26,5 @@ pre-configure: done .include "../../graphics/imlib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3