diff options
author | jlam <jlam> | 2004-11-12 06:39:19 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-11-12 06:39:19 +0000 |
commit | be3ea8c3d40a099627e8a8fae5f4f734141bdf86 (patch) | |
tree | ddbacf3026d39d6b23e622ac51745a4f7db32d44 /x11 | |
parent | adb5044aacd166f8bf54dbeeddc97a7f1837123d (diff) | |
download | pkgsrc-be3ea8c3d40a099627e8a8fae5f4f734141bdf86.tar.gz |
Remove redundant uses of PTHREAD_{CFLAGS,LDFLAGS} now that they're added
automatically by pthread.buildlink3.mk. Also, factor out the pthread
library out of PTHREAD_LDFLAGS into a standalone variable PTHREAD_LIBS
and use it in packages where necessary (usually the ones that don't
have a GNU configure script).
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gtk2/Makefile | 3 | ||||
-rw-r--r-- | x11/gtk2/distinfo | 4 | ||||
-rw-r--r-- | x11/gtk2/patches/patch-aa | 13 | ||||
-rw-r--r-- | x11/gtk2/patches/patch-ab | 13 | ||||
-rw-r--r-- | x11/qt3-libs/Makefile.common | 3 | ||||
-rw-r--r-- | x11/qt3-libs/files/qmake.conf | 6 | ||||
-rw-r--r-- | x11/xfce4-mcs-manager/Makefile | 5 | ||||
-rw-r--r-- | x11/xfce4-panel/Makefile | 5 | ||||
-rw-r--r-- | x11/xosd/Makefile.common | 4 |
9 files changed, 11 insertions, 45 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index a3678ca0330..b1c5244b2d2 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2004/10/13 07:28:36 jmmv Exp $ +# $NetBSD: Makefile,v 1.66 2004/11/12 06:39:21 jlam Exp $ # DISTNAME= gtk+-2.4.13 @@ -32,7 +32,6 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV+= ac_cv_header_X11_extensions_Xinerama_h=no CONFIGURE_ENV+= ac_cv_lib_Xinerama_XineramaQueryExtension=no MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" -MAKE_ENV+= PTHREAD_LDFLAGS="${PTHREAD_LDFLAGS}" TEST_TARGET= check PKGCONFIG_OVERRIDE= gdk-2.0.pc.in diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index 155483dd6fe..f537f0b0f33 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.32 2004/10/13 07:28:36 jmmv Exp $ +$NetBSD: distinfo,v 1.33 2004/11/12 06:39:21 jlam Exp $ SHA1 (gtk+-2.4.13.tar.bz2) = d57ad7165317e580cb7fda7719e767232e6697b6 Size (gtk+-2.4.13.tar.bz2) = 9272024 bytes -SHA1 (patch-aa) = 05be7ab51f2e9297f68e4b51a0086ff64ace970b -SHA1 (patch-ab) = 00ffc4436c64bd45042232a0a376d8a69de35d40 SHA1 (patch-ac) = 42dff743263b141029a814d7dec9fdc5637a3cff diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa deleted file mode 100644 index f6a4ddef174..00000000000 --- a/x11/gtk2/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.9 2004/04/01 18:15:41 jmmv Exp $ - ---- gdk-pixbuf/Makefile.in.orig 2004-03-09 16:08:28.000000000 +0100 -+++ gdk-pixbuf/Makefile.in -@@ -751,7 +751,7 @@ gdk_pixbuf_csource_LDFLAGS = - am_gdk_pixbuf_query_loaders_OBJECTS = queryloaders.$(OBJEXT) - gdk_pixbuf_query_loaders_OBJECTS = \ - $(am_gdk_pixbuf_query_loaders_OBJECTS) --gdk_pixbuf_query_loaders_LDFLAGS = -+gdk_pixbuf_query_loaders_LDFLAGS = $(PTHREAD_LDFLAGS) - test_gdk_pixbuf_SOURCES = test-gdk-pixbuf.c - test_gdk_pixbuf_OBJECTS = test-gdk-pixbuf.$(OBJEXT) - test_gdk_pixbuf_DEPENDENCIES = libgdk_pixbuf-$(GTK_API_VERSION).la diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab deleted file mode 100644 index 61a914a54fd..00000000000 --- a/x11/gtk2/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2004/04/01 18:15:41 jmmv Exp $ - ---- gtk/Makefile.in.orig 2004-03-09 16:08:31.000000000 +0100 -+++ gtk/Makefile.in -@@ -1113,7 +1113,7 @@ PROGRAMS = $(bin_PROGRAMS) - - am_gtk_query_immodules_2_0_OBJECTS = queryimmodules.$(OBJEXT) - gtk_query_immodules_2_0_OBJECTS = $(am_gtk_query_immodules_2_0_OBJECTS) --gtk_query_immodules_2_0_LDFLAGS = -+gtk_query_immodules_2_0_LDFLAGS = $(PTHREAD_LDFLAGS) - - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 1b4baed5373..c31470969a6 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.40 2004/10/30 13:28:40 grant Exp $ +# $NetBSD: Makefile.common,v 1.41 2004/11/12 06:39:21 jlam Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -104,6 +104,7 @@ post-patch: -e 's:@MKDIR@:${MKDIR}:g' \ -e 's:@LIBQT@:${LIBQT}:g' \ -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS}:g' \ + -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS}:g' \ -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \ ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf for dir in ${WRKSRC}/mkspecs/*; do \ diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index 31372cb532b..6e65b62d19b 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ -# $NetBSD: qmake.conf,v 1.16 2004/10/19 13:27:48 markd Exp $ -# $Id: qmake.conf,v 1.16 2004/10/19 13:27:48 markd Exp $ +# $NetBSD: qmake.conf,v 1.17 2004/11/12 06:39:21 jlam Exp $ +# $Id: qmake.conf,v 1.17 2004/11/12 06:39:21 jlam Exp $ # # qmake configuration for netbsd-g++ # @@ -75,7 +75,7 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm @SYS_LIBS@ QMAKE_LIBS_X11SM = -lICE -lSM QMAKE_LIBS_QT = @LIBQT@ QMAKE_LIBS_QT_THREAD = @LIBQT@ -QMAKE_LIBS_THREAD = @PTHREAD_LDFLAGS@ +QMAKE_LIBS_THREAD = @PTHREAD_LDFLAGS@ @PTHREAD_LIBS@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu diff --git a/x11/xfce4-mcs-manager/Makefile b/x11/xfce4-mcs-manager/Makefile index ddd06dc062f..4cf73effe29 100644 --- a/x11/xfce4-mcs-manager/Makefile +++ b/x11/xfce4-mcs-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/10/03 00:18:39 tv Exp $ +# $NetBSD: Makefile,v 1.9 2004/11/12 06:39:21 jlam Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -10,9 +10,6 @@ COMMENT= XFce4 settings manager PKGCONFIG_OVERRIDE= xfce-mcs-manager/xfce-mcs-manager.pc.in -CFLAGS+= ${PTHREAD_CFLAGS} -LIBS+= ${PTHREAD_LDFLAGS} - .include "../../x11/libxfce4gui/buildlink3.mk" .include "../../x11/libxfce4mcs/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile index 921e07d7d3d..e4f893d5507 100644 --- a/x11/xfce4-panel/Makefile +++ b/x11/xfce4-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/10/03 00:18:39 tv Exp $ +# $NetBSD: Makefile,v 1.12 2004/11/12 06:39:21 jlam Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -9,9 +9,6 @@ COMMENT= XFce4 panel PKGCONFIG_OVERRIDE= panel/xfce4-panel-1.0.pc.in -CFLAGS+= ${PTHREAD_CFLAGS} -LIBS+= ${PTHREAD_LDFLAGS} - .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common index ae5beffbc54..5fd6fcf1b49 100644 --- a/x11/xosd/Makefile.common +++ b/x11/xosd/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2004/09/14 08:25:43 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.16 2004/11/12 06:39:21 jlam Exp $ DISTNAME= xosd-2.2.12 CATEGORIES= x11 @@ -26,6 +26,6 @@ CONFIGURE_ENV+= F77=${FALSE} SUBST_CLASSES= fixme SUBST_STAGE.fixme= post-patch SUBST_FILES.fixme= configure -SUBST_SED.fixme= -e "s|-lpthread|${PTHREAD_LDFLAGS}|g" +SUBST_SED.fixme= -e "s|-lpthread|${PTHREAD_LIBS}|g" .include "../../mk/pthread.buildlink3.mk" |