From 4fbb0b8820149328079cb4bf9499ac01e599bb6f Mon Sep 17 00:00:00 2001 From: gusi Date: Mon, 28 Apr 2014 11:41:58 +0000 Subject: Remove ltverhack all around the place. Add USES=libtool:keepla as needed. x11-toolkits/gtkmm30 changed the lib version, so bumpd the version of gtkm30 and the users of that port (gnote, clutermm and gnome-system-monitor). While here remove ${STRIP_CMD} git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19593 df743ca5-7f9a-e211-a948-0013205c9059 --- deskutils/gnote/Makefile | 3 ++- devel/cluttermm/Makefile | 1 + graphics/cairo/Makefile | 12 ++++-------- graphics/cairo/pkg-plist | 6 ++++++ net-im/loudmouth/Makefile | 5 +++-- net-im/loudmouth/pkg-plist | 1 + net-im/telepathy-farstream/Makefile | 7 ++----- net-im/telepathy-farstream/pkg-plist | 1 + net/grilo-plugins/Makefile | 7 ++----- net/grilo-plugins/pkg-plist | 3 +++ net/grilo/Makefile | 11 +++-------- net/grilo/pkg-plist | 3 +++ sysutils/gnome-system-monitor/Makefile | 3 ++- x11-toolkits/gtkmm30/Makefile | 10 +++------- x11-toolkits/gtkmm30/pkg-plist | 6 ++++-- x11-toolkits/gtksourceview3/Makefile | 5 +---- x11-toolkits/libwnck3/Makefile | 8 ++------ x11-toolkits/libwnck3/pkg-plist | 1 + x11/libgnomekbd/Makefile | 10 +++------- x11/libgnomekbd/pkg-plist | 2 ++ 20 files changed, 49 insertions(+), 56 deletions(-) diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile index d0ee9ea31..669ea0aa5 100644 --- a/deskutils/gnote/Makefile +++ b/deskutils/gnote/Makefile @@ -1,9 +1,10 @@ # Created by: Gustau Perez i Querol # $FreeBSD$ -# $MCom: ports-experimental/trunk/deskutils/gnote/Makefile 19343 2014-03-26 06:57:08Z gusi $ +# $MCom$ PORTNAME= gnote PORTVERSION= 3.12.0 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME diff --git a/devel/cluttermm/Makefile b/devel/cluttermm/Makefile index 8522663cb..e820085f1 100644 --- a/devel/cluttermm/Makefile +++ b/devel/cluttermm/Makefile @@ -4,6 +4,7 @@ PORTNAME= cluttermm PORTVERSION= 1.17.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 345f83cb7..b273968fb 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -13,19 +13,19 @@ COMMENT= Vector graphics library with cross-device output support PORTSCOUT= skipv:5c-1\.[1-3] +USES= tar:xz + .if !defined(REFERENCE_PORT) LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ libpng15.so:${PORTSDIR}/graphics/png \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig -USE_XZ= yes -USES= pathfix pkgconfig +USES+= libtool:keepla pathfix pkgconfig USE_XORG= pixman xext -USE_GNOME= ltverhack referencehack +USE_GNOME= referencehack GNU_CONFIGURE= yes USE_LDCONFIG= yes -ltverhack_PATCH_FILES= build/ltmain.sh CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --disable-directfb \ @@ -100,10 +100,6 @@ post-patch: ${WRKSRC}/src/Makefile.in .endif -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcairo*.so.2 - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cairo/*.so.0 - .include .endif diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist index b9f037513..b5333c07f 100644 --- a/graphics/cairo/pkg-plist +++ b/graphics/cairo/pkg-plist @@ -20,26 +20,32 @@ lib/cairo/cairo-fdr.a lib/cairo/cairo-fdr.la lib/cairo/cairo-fdr.so lib/cairo/cairo-fdr.so.0 +lib/cairo/cairo-fdr.so.0.0.0 lib/cairo/cairo-sphinx.a lib/cairo/cairo-sphinx.la lib/cairo/cairo-sphinx.so lib/cairo/cairo-sphinx.so.0 +lib/cairo/cairo-sphinx.so.0.0.0 lib/cairo/libcairo-trace.a lib/cairo/libcairo-trace.la lib/cairo/libcairo-trace.so lib/cairo/libcairo-trace.so.0 +lib/cairo/libcairo-trace.so.0.0.0 %%GLIB%%lib/libcairo-gobject.a %%GLIB%%lib/libcairo-gobject.la %%GLIB%%lib/libcairo-gobject.so %%GLIB%%lib/libcairo-gobject.so.2 +%%GLIB%%lib/libcairo-gobject.so.2.11200.16 lib/libcairo-script-interpreter.a lib/libcairo-script-interpreter.la lib/libcairo-script-interpreter.so lib/libcairo-script-interpreter.so.2 +lib/libcairo-script-interpreter.so.2.11200.16 lib/libcairo.a lib/libcairo.la lib/libcairo.so lib/libcairo.so.2 +lib/libcairo.so.2.11200.16 libdata/pkgconfig/cairo.pc libdata/pkgconfig/cairo-fc.pc libdata/pkgconfig/cairo-ft.pc diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile index ee8496ed1..541ccdda4 100644 --- a/net-im/loudmouth/Makefile +++ b/net-im/loudmouth/Makefile @@ -1,5 +1,6 @@ # Created by: Adam Weinberger # $FreeBSD$ +# $MCom$ PORTNAME= loudmouth PORTVERSION= 1.4.3 @@ -12,11 +13,11 @@ COMMENT= Lightweight Jabber client library LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn +USES= gettext gmake libtool:keepla pathfix pkgconfig +USE_GNOME= glib20 USE_BZIP2= yes -USES= gettext gmake pathfix pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GNOME= glib20 ltverhack CONFIGURE_ARGS= --disable-gtk-doc CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -Wl,-Bsymbolic -L${LOCALBASE}/lib diff --git a/net-im/loudmouth/pkg-plist b/net-im/loudmouth/pkg-plist index 540f79e05..373b7a05a 100644 --- a/net-im/loudmouth/pkg-plist +++ b/net-im/loudmouth/pkg-plist @@ -11,6 +11,7 @@ lib/libloudmouth-1.a lib/libloudmouth-1.la lib/libloudmouth-1.so lib/libloudmouth-1.so.0 +lib/libloudmouth-1.so.0.1.0 libdata/pkgconfig/loudmouth-1.0.pc share/gtk-doc/html/loudmouth/ch01.html share/gtk-doc/html/loudmouth/home.png diff --git a/net-im/telepathy-farstream/Makefile b/net-im/telepathy-farstream/Makefile index 51f558ed0..b54ec65b7 100644 --- a/net-im/telepathy-farstream/Makefile +++ b/net-im/telepathy-farstream/Makefile @@ -15,11 +15,11 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \ libfarstream-0.2.so:${PORTSDIR}/net-im/farstream +USES= gmake libtool:keepla pathfix pkgconfig +USE_GNOME= glib20 libxslt:build introspection:build GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_PYTHON= yes -USES= gmake pathfix pkgconfig -USE_GNOME= glib20 libxslt:build ltverhack introspection:build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -27,7 +27,4 @@ post-patch: @${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/telepathy-farstream/Makefile.in -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* - .include diff --git a/net-im/telepathy-farstream/pkg-plist b/net-im/telepathy-farstream/pkg-plist index 99c71aa1e..2a5917d75 100644 --- a/net-im/telepathy-farstream/pkg-plist +++ b/net-im/telepathy-farstream/pkg-plist @@ -6,6 +6,7 @@ lib/libtelepathy-farstream.a lib/libtelepathy-farstream.la lib/libtelepathy-farstream.so lib/libtelepathy-farstream.so.3 +lib/libtelepathy-farstream.so.3.0.1 libdata/pkgconfig/telepathy-farstream.pc share/gir-1.0/TelepathyFarstream-0.6.gir share/gtk-doc/html/telepathy-farstream/TfChannel.html diff --git a/net/grilo-plugins/Makefile b/net/grilo-plugins/Makefile index 43fdcaf6c..88eef4096 100644 --- a/net/grilo-plugins/Makefile +++ b/net/grilo-plugins/Makefile @@ -1,6 +1,6 @@ # Created by: Gustau Perez i Querol # $FreeBSD$ -# $MCom: ports-experimental/trunk/net/grilo-plugins/Makefile 19450 2014-04-05 11:31:57Z gusi $ +# $MCom$ PORTNAME= grilo-plugins PORTVERSION= 0.2.12 @@ -16,7 +16,7 @@ LIB_DEPENDS= libgrilo-0.2.so:${PORTSDIR}/net/grilo USES= gettext gmake libtool:keepla pathfix pkgconfig tar:xz USE_LDCONFIG= yes -USE_GNOME= glib20 gnomehier intlhack libxml2 ltverhack +USE_GNOME= glib20 gnomehier intlhack libxml2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/grilo-0.2/ LDFLAGS+= -L${LOCALBASE}/lib @@ -28,7 +28,4 @@ TRACKER_CONFIGURE_ENABLE= migration TRACKER_LIB_DEPENDS= libtracker-sparql-1.0.so:${PORTSDIR}/sysutils/tracker TRACKER_DESC= Tracker support for grilo (used by gnome-music and possibly others) -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/grilo-0.2/libgrl*.so - .include diff --git a/net/grilo-plugins/pkg-plist b/net/grilo-plugins/pkg-plist index 744e39c63..f6f397366 100644 --- a/net/grilo-plugins/pkg-plist +++ b/net/grilo-plugins/pkg-plist @@ -3,6 +3,7 @@ lib/grilo-0.2/grl-bliptv.xml lib/grilo-0.2/grl-bookmarks.xml lib/grilo-0.2/grl-filesystem.xml lib/grilo-0.2/grl-flickr.xml +lib/grilo-0.2/grl-freebox.xml lib/grilo-0.2/grl-gravatar.xml lib/grilo-0.2/grl-jamendo.xml lib/grilo-0.2/grl-lastfm-albumart.xml @@ -25,6 +26,8 @@ lib/grilo-0.2/libgrlfilesystem.la lib/grilo-0.2/libgrlfilesystem.so lib/grilo-0.2/libgrlflickr.la lib/grilo-0.2/libgrlflickr.so +lib/grilo-0.2/libgrlfreebox.la +lib/grilo-0.2/libgrlfreebox.so lib/grilo-0.2/libgrlgravatar.la lib/grilo-0.2/libgrlgravatar.so lib/grilo-0.2/libgrljamendo.la diff --git a/net/grilo/Makefile b/net/grilo/Makefile index b523ae25f..04eff1891 100644 --- a/net/grilo/Makefile +++ b/net/grilo/Makefile @@ -1,6 +1,6 @@ # Created by: Gustau Perez i Querol # $FreeBSD$ -# $MCom: ports-experimental/trunk/net/grilo/Makefile 19276 2014-03-24 15:49:45Z gusi $ +# $MCom$ PORTNAME= grilo PORTVERSION= 0.2.10 @@ -15,9 +15,9 @@ LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ liboauth.so:${PORTSDIR}/net/liboauth \ libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser -USES= gettext gmake pathfix pkgconfig tar:xz +USES= gettext gmake libtool:keepla pathfix pkgconfig tar:xz USE_LDCONFIG= yes -USE_GNOME= glib20 gnomehier intlhack introspection:build libxml2 ltverhack +USE_GNOME= glib20 gnomehier intlhack introspection:build libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-vala -disable-debug CPPFLAGS+= -I${LOCALBASE}/include @@ -33,9 +33,4 @@ UI_DESC= Enable testing UI UI_CONFIGURE_ENABLE=test-ui UI_USE= GNOME=gtk30 -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgrilo-0.2.so.1 - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgrlnet-0.2.so.0 - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgrlpls-0.2.so.0 - .include diff --git a/net/grilo/pkg-plist b/net/grilo/pkg-plist index 84bde1611..9e32a53c2 100644 --- a/net/grilo/pkg-plist +++ b/net/grilo/pkg-plist @@ -34,14 +34,17 @@ lib/libgrilo-0.2.a lib/libgrilo-0.2.la lib/libgrilo-0.2.so lib/libgrilo-0.2.so.1 +lib/libgrilo-0.2.so.1.6.0 lib/libgrlnet-0.2.a lib/libgrlnet-0.2.la lib/libgrlnet-0.2.so lib/libgrlnet-0.2.so.0 +lib/libgrlnet-0.2.so.0.1.7 lib/libgrlpls-0.2.a lib/libgrlpls-0.2.la lib/libgrlpls-0.2.so lib/libgrlpls-0.2.so.0 +lib/libgrlpls-0.2.so.0.0.2 libdata/pkgconfig/grilo-0.2.pc libdata/pkgconfig/grilo-net-0.2.pc libdata/pkgconfig/grilo-pls-0.2.pc diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index f8dc02d48..693d7b774 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -1,9 +1,10 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports-experimental/trunk/sysutils/gnome-system-monitor/Makefile 19505 2014-04-14 21:13:46Z gusi $ +# $MCom$ PORTNAME= gnome-system-monitor PORTVERSION= 3.12.1 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile index 5af20f0e3..dada32634 100644 --- a/x11-toolkits/gtkmm30/Makefile +++ b/x11-toolkits/gtkmm30/Makefile @@ -4,7 +4,7 @@ PORTNAME= gtkmm PORTVERSION= 3.12.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME PKGNAMESUFFIX= 30 @@ -19,14 +19,13 @@ USES= tar:xz BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USES+= gettext gmake pathfix pkgconfig -USE_GNOME= gtk30 ltverhack glibmm cairomm atkmm pangomm +USES+= gettext gmake libtool:keepla pathfix pkgconfig +USE_GNOME= gtk30 glibmm cairomm atkmm pangomm GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-documentation -#ltverhack_PATCH_FILES= build/ltmain.sh PLIST_SUB= VERSION="3.0" API_VERSION="3.0" @@ -34,9 +33,6 @@ post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \ ${WRKSRC}/Makefile.in -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libg?kmm-3.0.so.2 - .include .endif diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist index a4848a0c3..0432d455c 100644 --- a/x11-toolkits/gtkmm30/pkg-plist +++ b/x11-toolkits/gtkmm30/pkg-plist @@ -486,10 +486,12 @@ lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtk.m4 lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtkmm.m4 lib/libgdkmm-%%VERSION%%.la lib/libgdkmm-%%VERSION%%.so -lib/libgdkmm-%%VERSION%%.so.2 +lib/libgdkmm-%%VERSION%%.so.1 +lib/libgdkmm-%%VERSION%%.so.1.1.0 lib/libgtkmm-%%VERSION%%.la lib/libgtkmm-%%VERSION%%.so -lib/libgtkmm-%%VERSION%%.so.2 +lib/libgtkmm-%%VERSION%%.so.1 +lib/libgtkmm-%%VERSION%%.so.1.1.0 libdata/pkgconfig/gdkmm-%%API_VERSION%%.pc libdata/pkgconfig/gtkmm-%%API_VERSION%%.pc @dirrm lib/gtkmm-%%API_VERSION%%/proc/m4 diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile index 3e3f57dd1..2f2f78cb8 100644 --- a/x11-toolkits/gtksourceview3/Makefile +++ b/x11-toolkits/gtksourceview3/Makefile @@ -16,7 +16,7 @@ COMMENT= Text widget that adds syntax highlighting to the GtkTextView widget USES+= gettext gmake libtool:keepla pathfix pkgconfig tar:xz USE_GNOME= gnomeprefix gtk30 intlhack introspection:build \ - libxml2 ltverhack referencehack + libxml2 referencehack GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-compile-warnings=no --enable-glade-catalog=no \ @@ -28,9 +28,6 @@ post-patch: @${REINPLACE_CMD} -e 's|--warn-all||g' \ ${WRKSRC}/gtksourceview/Makefile.in -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgtksourceview-3.0.so.1 - .include .endif diff --git a/x11-toolkits/libwnck3/Makefile b/x11-toolkits/libwnck3/Makefile index d46529650..394a5c5cf 100644 --- a/x11-toolkits/libwnck3/Makefile +++ b/x11-toolkits/libwnck3/Makefile @@ -18,9 +18,8 @@ USES= tar:xz LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification -USES+= bison gettext gmake pathfix pkgconfig -USE_GNOME= gtk30 intlhack introspection:build ltverhack \ - referencehack +USES+= bison gettext gmake libtool:keepla pathfix pkgconfig +USE_GNOME= gtk30 intlhack introspection:build referencehack USE_XORG= xres x11 USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -28,9 +27,6 @@ CONFIGURE_ARGS= --disable-tools CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libwnck-3.so.0 - .include .endif diff --git a/x11-toolkits/libwnck3/pkg-plist b/x11-toolkits/libwnck3/pkg-plist index c8233af87..c119c0698 100644 --- a/x11-toolkits/libwnck3/pkg-plist +++ b/x11-toolkits/libwnck3/pkg-plist @@ -14,6 +14,7 @@ include/libwnck-3.0/libwnck/workspace.h lib/libwnck-3.la lib/libwnck-3.so lib/libwnck-3.so.0 +lib/libwnck-3.so.0.2.2 libdata/pkgconfig/libwnck-3.0.pc lib/girepository-1.0/Wnck-3.0.typelib share/gtk-doc/html/libwnck-3.0/WnckApplication.html diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index 24024b023..98da6aa8d 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -1,6 +1,6 @@ # Created by: Michael Johnson # $FreeBSD$ -# $MCom: ports/trunk/x11/libgnomekbd3/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= libgnomekbd PORTVERSION= 3.6.0 @@ -14,13 +14,12 @@ COMMENT= GNOME keyboard shared library BUILD_DEPENDS= libxklavier>=5.2:${PORTSDIR}/x11/libxklavier LIB_DEPENDS= libxklavier.so:${PORTSDIR}/x11/libxklavier -USE_XZ= yes +USES= gettext gmake libtool:keepla pathfix pkgconfig tar:xz USE_GNOME= gnomeprefix gtk30 intltool introspection:build \ - ltverhack libxml2 + libxml2 GNU_CONFIGURE= yes USE_XORG= ice INSTALLS_ICONS= yes -USES= gettext gmake pathfix pkgconfig USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -29,7 +28,4 @@ GLIB_SCHEMAS= org.gnome.libgnomekbd.desktop.gschema.xml \ org.gnome.libgnomekbd.gschema.xml \ org.gnome.libgnomekbd.keyboard.gschema.xml -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnomekbd*.so.8 - .include diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist index e1c8a1c6b..64c2a33e0 100644 --- a/x11/libgnomekbd/pkg-plist +++ b/x11/libgnomekbd/pkg-plist @@ -12,10 +12,12 @@ lib/libgnomekbd.a lib/libgnomekbd.la lib/libgnomekbd.so lib/libgnomekbd.so.8 +lib/libgnomekbd.so.8.0.0 lib/libgnomekbdui.a lib/libgnomekbdui.la lib/libgnomekbdui.so lib/libgnomekbdui.so.8 +lib/libgnomekbdui.so.8.0.0 libdata/pkgconfig/libgnomekbd.pc libdata/pkgconfig/libgnomekbdui.pc share/GConf/gsettings/libgnomekbd.convert -- cgit v1.2.3