From ff2365417384113a02c3222a5aa16b1b8421adda Mon Sep 17 00:00:00 2001 From: jasper Date: Thu, 17 Nov 2011 11:42:31 +0000 Subject: [PATCH] - move away from gnu libtool now that gobject-introspection has been fixed. --- devel/ethos/Makefile | 6 ++---- graphics/babl/Makefile | 6 ++---- graphics/clutter/clutter-gtk/Makefile | 6 +----- graphics/evince/Makefile | 6 +----- graphics/goocanvas2/Makefile | 6 +----- multimedia/gstreamer-0.10/plugins-base/Makefile | 7 ++----- sysutils/polkit/Makefile | 6 ++---- www/webkit/Makefile | 6 ++---- x11/gnome/games/Makefile | 6 +----- x11/gnome/online-accounts/Makefile | 6 +----- 10 files changed, 15 insertions(+), 46 deletions(-) diff --git a/devel/ethos/Makefile b/devel/ethos/Makefile index 3c670d45678..d9f1eba374f 100644 --- a/devel/ethos/Makefile +++ b/devel/ethos/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2011/11/04 09:18:43 jasper Exp $ +# $OpenBSD: Makefile,v 1.22 2011/11/17 11:42:31 jasper Exp $ # XXX fix building with glib2 >= 2.29 (G_CONST_RETURN is deprecated) CFLAGS += "-DG_CONST_RETURN=const" @@ -31,9 +31,7 @@ CONFIGURE_ARGS = --disable-shave \ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -# XXX: the libtool wrapper script is passed as argument to g-ir-scanner, -# instead of the actual library -USE_LIBTOOL= gnu +USE_LIBTOOL = Yes USE_GMAKE = Yes MODULES = lang/python \ diff --git a/graphics/babl/Makefile b/graphics/babl/Makefile index d586cd599c7..9fad6c851d8 100644 --- a/graphics/babl/Makefile +++ b/graphics/babl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2011/06/02 17:09:31 kili Exp $ +# $OpenBSD: Makefile,v 1.11 2011/11/17 11:42:32 jasper Exp $ SHARED_ONLY= Yes @@ -27,13 +27,11 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/babl/${V:R}/ \ WANTLIB= m -# XXX: the libtool wrapper script is passed as argument to g-ir-scanner, -# instead of the actual library -USE_LIBTOOL= gnu LIBTOOL_FLAGS= --tag=disable-static BUILD_DEPENDS= devel/gobject-introspection +USE_LIBTOOL= Yes USE_GMAKE= Yes CONFIGURE_STYLE=gnu diff --git a/graphics/clutter/clutter-gtk/Makefile b/graphics/clutter/clutter-gtk/Makefile index ddec5a65ac4..123db18c84f 100644 --- a/graphics/clutter/clutter-gtk/Makefile +++ b/graphics/clutter/clutter-gtk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2011/11/01 20:30:49 jasper Exp $ +# $OpenBSD: Makefile,v 1.14 2011/11/17 11:42:31 jasper Exp $ COMMENT= GTK+2 widget for clutter @@ -18,10 +18,6 @@ WANTLIB += json-glib-1.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre pixman-1 png pthread-stubs xcb z xcb-render WANTLIB += clutter-glx-1.0 ffi xcb-shm -# XXX: the libtool wrapper script is passed as argument to g-ir-scanner, -# instead of the actual library -USE_LIBTOOL= gnu - BUILD_DEPENDS= devel/gobject-introspection LIB_DEPENDS= graphics/clutter/core>=1.0.6p3 \ x11/gtk+2 diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 03e73cbbeeb..c960f4d40a0 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.73 2011/10/17 18:40:16 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.74 2011/11/17 11:42:31 jasper Exp $ SHARED_ONLY= Yes @@ -97,10 +97,6 @@ MODGNOME_DESKTOP_FILE= Yes LIBTOOL_FLAGS= --tag=disable-static -# XXX: the libtool wrapper script is passed as argument to g-ir-scanner, -# instead of the actual library -USE_LIBTOOL= gnu - CONFIGURE_STYLE=gnu CONFIGURE_ARGS+= --disable-static \ --disable-comics \ diff --git a/graphics/goocanvas2/Makefile b/graphics/goocanvas2/Makefile index 291f6377d24..030088c4c63 100644 --- a/graphics/goocanvas2/Makefile +++ b/graphics/goocanvas2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2011/10/21 20:19:03 jasper Exp $ +# $OpenBSD: Makefile,v 1.9 2011/11/17 11:42:32 jasper Exp $ COMMENT= canvas widget for GTK+ based on Cairo @@ -39,8 +39,4 @@ CONFIGURE_STYLE=autoconf MODGNOME_TOOLS= goi -# XXX: the libtool wrapper script is passed as argument to g-ir-scanner, -# instead of the actual library -USE_LIBTOOL= gnu - .include diff --git a/multimedia/gstreamer-0.10/plugins-base/Makefile b/multimedia/gstreamer-0.10/plugins-base/Makefile index dbbb27c3c11..d6ed3424baa 100644 --- a/multimedia/gstreamer-0.10/plugins-base/Makefile +++ b/multimedia/gstreamer-0.10/plugins-base/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.44 2011/09/16 10:31:23 espie Exp $ +# $OpenBSD: Makefile,v 1.45 2011/11/17 11:42:32 jasper Exp $ COMMENT-main = base elements for GStreamer COMMENT-cdda = cd paranoia element for GStreamer (plugins-base) @@ -31,10 +31,6 @@ SHARED_LIBS += gstrtsp-0.10 2.5 # .23.0 MASTER_SITES = ${MASTER_SITE_GST:=gst-plugins-base/} MODULES = devel/gettext -# XXX: the libtool wrapper script is passed as argument to g-ir-scanner, -# instead of the actual library -USE_LIBTOOL= gnu - .for i in ${MULTI_PACKAGES} REGRESS_DEPENDS += ${BASE_PKGPATH},${i} .endfor @@ -75,5 +71,6 @@ CONFIGURE_ARGS += --disable-libvisual \ --enable-orc CONFIGURE_ENV += ac_cv_path_PYTHON="" USE_GROFF = Yes +USE_LIBTOOL = Yes .include diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile index eb8da488c01..a308aabf9f5 100644 --- a/sysutils/polkit/Makefile +++ b/sysutils/polkit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2011/09/16 11:41:40 espie Exp $ +# $OpenBSD: Makefile,v 1.28 2011/11/17 11:42:31 jasper Exp $ COMMENT= framework for granting privileged operations to users @@ -35,9 +35,7 @@ BUILD_DEPENDS= ${MODGNU_AUTOMAKE_DEPENDS} \ RUN_DEPENDS= x11/dbus -# XXX: the libtool wrapper script is passed as argument to g-ir-scanner, -# instead of the actual library -USE_LIBTOOL= gnu +USE_LIBTOOL= Yes # needs AM_PROG_LIBTOOL #BUILD_DEPENDS+= devel/libtool diff --git a/www/webkit/Makefile b/www/webkit/Makefile index e1f1165b8a3..a7c348fbf4b 100644 --- a/www/webkit/Makefile +++ b/www/webkit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.59 2011/11/02 20:00:58 jasper Exp $ +# $OpenBSD: Makefile,v 1.60 2011/11/17 11:42:31 jasper Exp $ ONLY_FOR_ARCHS= ${GCC4_ARCHS} @@ -24,10 +24,8 @@ PERMIT_DISTFILES_FTP = Yes VMEM_WARNING = Yes +USE_LIBTOOL = Yes USE_GMAKE = Yes -# XXX: the libtool wrapper script is passed as argument to g-ir-scanner, -# instead of the actual library -USE_LIBTOOL = gnu MODULES = devel/gettext \ textproc/intltool \ diff --git a/x11/gnome/games/Makefile b/x11/gnome/games/Makefile index 7b9debb5c67..2b14e7f7446 100755 --- a/x11/gnome/games/Makefile +++ b/x11/gnome/games/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.56 2011/10/29 08:12:32 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.57 2011/11/17 11:42:31 jasper Exp $ BROKEN= update needs fixed clutter/Mesa @@ -48,10 +48,6 @@ RUN_DEPENDS= multimedia/gstreamer-0.10/plugins-good # x11/gnome/py-gnome-desktop REGRESS_DEPENDS= devel/check -# XXX: the libtool wrapper script is passed as argument to g-ir-scanner, -# instead of the actual library -USE_LIBTOOL= gnu - MODGNOME_TOOLS= goi yelp MODGNOME_DESKTOP_FILE= Yes diff --git a/x11/gnome/online-accounts/Makefile b/x11/gnome/online-accounts/Makefile index 6c435719fde..42960f98722 100644 --- a/x11/gnome/online-accounts/Makefile +++ b/x11/gnome/online-accounts/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2011/10/18 08:41:41 jasper Exp $ +# $OpenBSD: Makefile,v 1.13 2011/11/17 11:42:32 jasper Exp $ COMMENT= interfaces for interacting with online accounts @@ -39,10 +39,6 @@ LIB_DEPENDS= devel/json-glib \ MODGNOME_TOOLS= goi -# XXX: the libtool wrapper script is passed as argument to g-ir-scanner, -# instead of the actual library -USE_LIBTOOL= gnu - CONFIGURE_ARGS= --localstatedir=/var .include