From owner-svn-ports-all@FreeBSD.ORG Tue May 27 11:17:45 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 317AAD48; Tue, 27 May 2014 11:17:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B56A2CD9; Tue, 27 May 2014 11:17:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4RBHjPX051059; Tue, 27 May 2014 11:17:45 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4RBHfac051029; Tue, 27 May 2014 11:17:41 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201405271117.s4RBHfac051029@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 27 May 2014 11:17:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355486 - in head: audio/osdmixer deskutils/tpb deskutils/xneur misc/hotkeys misc/py-osd misc/xosd net-im/licq-osd net-im/pidgin-osd polish/ekg2 polish/gnugadu2 sysutils/lineak-xosdplug... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 May 2014 11:17:45 -0000 Author: amdmi3 Date: Tue May 27 11:17:41 2014 New Revision: 355486 URL: http://svnweb.freebsd.org/changeset/ports/355486 QAT: https://qat.redports.org/buildarchive/r355486/ Log: - Convert misc/xosd and dependent ports which need it (deskutils/xneur, polish/ekg2, polish/gnugadu2, sysutils/lineak-xosdplugin) to USES=libtool, drop .la files - Since xosd shlib version has changed, bump all ports which depend on it - Stagify deskutils/xneur - Convert USE_BZIP2 to USES - Use new LIB_DEPENDS syntax Approved by: portmgr blanket Modified: head/audio/osdmixer/Makefile head/deskutils/tpb/Makefile head/deskutils/xneur/Makefile head/deskutils/xneur/pkg-plist head/misc/hotkeys/Makefile head/misc/py-osd/Makefile head/misc/xosd/Makefile head/misc/xosd/pkg-plist head/net-im/licq-osd/Makefile head/net-im/pidgin-osd/Makefile head/polish/ekg2/Makefile head/polish/ekg2/pkg-plist head/polish/gnugadu2/Makefile head/polish/gnugadu2/pkg-plist head/sysutils/lineak-xosdplugin/Makefile head/sysutils/nbosd/Makefile head/x11-clocks/osdclock/Makefile Modified: head/audio/osdmixer/Makefile ============================================================================== --- head/audio/osdmixer/Makefile Tue May 27 10:55:39 2014 (r355485) +++ head/audio/osdmixer/Makefile Tue May 27 11:17:41 2014 (r355486) @@ -3,7 +3,7 @@ PORTNAME= osdmixer PORTVERSION= 0.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MASTER_SITES= http://bsd-geek.de/FreeBSD/distfiles/ Modified: head/deskutils/tpb/Makefile ============================================================================== --- head/deskutils/tpb/Makefile Tue May 27 10:55:39 2014 (r355485) +++ head/deskutils/tpb/Makefile Tue May 27 11:17:41 2014 (r355486) @@ -3,7 +3,7 @@ PORTNAME= tpb PORTVERSION= 0.6.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= deskutils MASTER_SITES= SAVANNAH Modified: head/deskutils/xneur/Makefile ============================================================================== --- head/deskutils/xneur/Makefile Tue May 27 10:55:39 2014 (r355485) +++ head/deskutils/xneur/Makefile Tue May 27 11:17:41 2014 (r355486) @@ -3,7 +3,7 @@ PORTNAME= xneur PORTVERSION= 0.15.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MASTER_SITES= http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \ http://mirror.amdmi3.ru/distfiles/ @@ -14,8 +14,7 @@ COMMENT= Auto keyboard switcher LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify \ libpcre.so:${PORTSDIR}/devel/pcre -USE_BZIP2= yes -USES= pkgconfig iconv +USES= pkgconfig iconv tar:bzip2 libtool USE_GNOME= gnomehack GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} @@ -25,16 +24,12 @@ CONFIGURE_ARGS= --disable-static --libdi USE_LDCONFIG= yes INSTALLS_ICONS= yes -MAN1= xneur.1 -MAN5= xneurrc.5 - OPTIONS_DEFINE= ASPELL XOSD NLS X11 OPTIONS_DEFAULT= GSTREAMER ASPELL OPTIONS_RADIO= SOUND OPTIONS_RADIO_SOUND= GSTREAMER OPENAL XOSD_DESC= Xosd support -NO_STAGE= yes .include .if ${PORT_OPTIONS:MNLS} @@ -80,9 +75,4 @@ CONFIGURE_ARGS+= --without-xosd post-patch: @${MV} ${WRKSRC}/etc/xneurrc ${WRKSRC}/etc/xneurrc.sample -post-install: -.if !exists(${PREFIX}/etc/xneur/xneurrc) - ${CP} -p ${PREFIX}/etc/xneur/xneurrc.sample ${PREFIX}/etc/xneur/xneurrc -.endif - .include Modified: head/deskutils/xneur/pkg-plist ============================================================================== --- head/deskutils/xneur/pkg-plist Tue May 27 10:55:39 2014 (r355485) +++ head/deskutils/xneur/pkg-plist Tue May 27 11:17:41 2014 (r355486) @@ -3,20 +3,22 @@ bin/xneur etc/xneur/xneurrc.sample @exec if [ ! -f %D/etc/xneur/xneurrc ] ; then cp -p %D/%F %B/xneurrc; fi @dirrmtry etc/xneur +lib/xneur/libxneur.so.15.0.0 lib/xneur/libxneur.so.15 lib/xneur/libxneur.so -lib/xneur/libxneur.la +lib/xneur/libxnconfig.so.15.0.0 lib/xneur/libxnconfig.so.15 lib/xneur/libxnconfig.so -lib/xneur/libxnconfig.la +lib/xneur/xneur/libxntest.so.0.0.0 lib/xneur/xneur/libxntest.so.0 lib/xneur/xneur/libxntest.so -lib/xneur/xneur/libxntest.la +lib/xneur/xneur/libxnstatistic.so.0.0.0 lib/xneur/xneur/libxnstatistic.so.0 lib/xneur/xneur/libxnstatistic.so -lib/xneur/xneur/libxnstatistic.la @dirrm lib/xneur/xneur @dirrm lib/xneur +man/man1/xneur.1.gz +man/man5/xneurrc.5.gz include/xneur/list_char.h include/xneur/xneur.h include/xneur/xnconfig.h Modified: head/misc/hotkeys/Makefile ============================================================================== --- head/misc/hotkeys/Makefile Tue May 27 10:55:39 2014 (r355485) +++ head/misc/hotkeys/Makefile Tue May 27 11:17:41 2014 (r355486) @@ -3,7 +3,7 @@ PORTNAME= hotkeys PORTVERSION= 0.5.7.1 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= misc MASTER_SITES= http://ypwong.org/hotkeys/${PORTVERSION}/ DISTNAME= hotkeys_${PORTVERSION} Modified: head/misc/py-osd/Makefile ============================================================================== --- head/misc/py-osd/Makefile Tue May 27 10:55:39 2014 (r355485) +++ head/misc/py-osd/Makefile Tue May 27 11:17:41 2014 (r355486) @@ -3,7 +3,7 @@ PORTNAME= osd PORTVERSION= 0.2.14 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= misc python MASTER_SITES= http://ichi2.net/pyosd/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/misc/xosd/Makefile ============================================================================== --- head/misc/xosd/Makefile Tue May 27 10:55:39 2014 (r355485) +++ head/misc/xosd/Makefile Tue May 27 11:17:41 2014 (r355486) @@ -3,7 +3,7 @@ PORTNAME= xosd PORTVERSION= 2.2.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MASTER_SITES= SF/libxosd/libxosd/${PORTNAME}-${PORTVERSION} @@ -12,16 +12,17 @@ COMMENT= X11 on-screen-display program a LICENSE= GPLv2 -USES= gmake pkgconfig -USE_AUTOTOOLS= libtool +USES= gmake pkgconfig libtool USE_CSTD= gnu89 USE_XORG= x11 xext xt sm ice USE_LDCONFIG= yes +GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS=${PTHREAD_LIBS}' -L${LOCALBASE}/lib' \ LOCALBASE='${LOCALBASE}' \ GTK_CONFIG='${GTK_CONFIG}' GLIB_CONFIG='${GLIB_CONFIG}' CONFIGURE_ARGS= --disable-beep_media_player_plugin --disable-new-plugin PATCH_STRIP= -p1 +INSTALL_TARGET= install-strip PORTDOCS= AUTHORS ChangeLog TODO Modified: head/misc/xosd/pkg-plist ============================================================================== --- head/misc/xosd/pkg-plist Tue May 27 10:55:39 2014 (r355485) +++ head/misc/xosd/pkg-plist Tue May 27 11:17:41 2014 (r355486) @@ -2,9 +2,9 @@ bin/osd_cat bin/xosd-config include/xosd.h lib/libxosd.a -lib/libxosd.la lib/libxosd.so -lib/libxosd.so.4 +lib/libxosd.so.2 +lib/libxosd.so.2.2.14 man/man1/osd_cat.1.gz man/man1/xosd-config.1.gz man/man3/xosd.3.gz Modified: head/net-im/licq-osd/Makefile ============================================================================== --- head/net-im/licq-osd/Makefile Tue May 27 10:55:39 2014 (r355485) +++ head/net-im/licq-osd/Makefile Tue May 27 11:17:41 2014 (r355486) @@ -3,7 +3,7 @@ PORTNAME= osd PORTVERSION= 1.8.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net-im Modified: head/net-im/pidgin-osd/Makefile ============================================================================== --- head/net-im/pidgin-osd/Makefile Tue May 27 10:55:39 2014 (r355485) +++ head/net-im/pidgin-osd/Makefile Tue May 27 11:17:41 2014 (r355486) @@ -3,7 +3,7 @@ PORTNAME= pidgin-osd PORTVERSION= 0.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-im MASTER_SITES= https://babelize.org/download/pidgin-osd/ Modified: head/polish/ekg2/Makefile ============================================================================== --- head/polish/ekg2/Makefile Tue May 27 10:55:39 2014 (r355485) +++ head/polish/ekg2/Makefile Tue May 27 11:17:41 2014 (r355486) @@ -3,7 +3,7 @@ PORTNAME= ekg2 PORTVERSION= 0.3.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= polish net-im MASTER_SITES= http://pl.ekg2.org/ @@ -17,7 +17,7 @@ LIB_DEPENDS= libgadu.so:${PORTSDIR}/poli LICENSE= GPLv2 GNU_CONFIGURE= yes -USES= gmake iconv pathfix pkgconfig +USES= gmake iconv pathfix pkgconfig libtool CONFIGURE_ARGS+= --enable-shared \ --disable-static \ Modified: head/polish/ekg2/pkg-plist ============================================================================== --- head/polish/ekg2/pkg-plist Tue May 27 10:55:39 2014 (r355485) +++ head/polish/ekg2/pkg-plist Tue May 27 11:17:41 2014 (r355486) @@ -1,62 +1,33 @@ bin/ekg2 -lib/ekg2/plugins/autoresponder.la lib/ekg2/plugins/autoresponder.so lib/ekg2/plugins/feed.so -lib/ekg2/plugins/feed.la lib/ekg2/plugins/gg.so -lib/ekg2/plugins/gg.la -%%GPG%%lib/ekg2/plugins/gpg.la %%GPG%%lib/ekg2/plugins/gpg.so %%GSM%%lib/ekg2/plugins/gsm.so -%%GSM%%lib/ekg2/plugins/gsm.la %%GTK2%%lib/ekg2/plugins/gtk.so -%%GTK2%%lib/ekg2/plugins/gtk.la -lib/ekg2/plugins/httprc_xajax.la lib/ekg2/plugins/httprc_xajax.so -lib/ekg2/plugins/icq.la lib/ekg2/plugins/icq.so -lib/ekg2/plugins/ioctld.la lib/ekg2/plugins/ioctld.so -lib/ekg2/plugins/irc.la lib/ekg2/plugins/irc.so lib/ekg2/plugins/jabber.so -lib/ekg2/plugins/jabber.la -lib/ekg2/plugins/jogger.la lib/ekg2/plugins/jogger.so -lib/ekg2/plugins/logs.la lib/ekg2/plugins/logs.so %%SQLITE%%lib/ekg2/plugins/logsqlite.so -%%SQLITE%%lib/ekg2/plugins/logsqlite.la -lib/ekg2/plugins/mail.la lib/ekg2/plugins/mail.so -lib/ekg2/plugins/ncurses.la lib/ekg2/plugins/ncurses.so %%PERL%%lib/ekg2/plugins/perl.so -%%PERL%%lib/ekg2/plugins/perl.la -lib/ekg2/plugins/pcm.la lib/ekg2/plugins/pcm.so -lib/ekg2/plugins/polchat.la lib/ekg2/plugins/polchat.so %%PYTHON%%lib/ekg2/plugins/python.so -%%PYTHON%%lib/ekg2/plugins/python.la -lib/ekg2/plugins/rc.la lib/ekg2/plugins/rc.so -lib/ekg2/plugins/readline.la lib/ekg2/plugins/readline.so -lib/ekg2/plugins/remote.la lib/ekg2/plugins/remote.so -lib/ekg2/plugins/rivchat.la lib/ekg2/plugins/rivchat.so -lib/ekg2/plugins/rot13.la lib/ekg2/plugins/rot13.so -lib/ekg2/plugins/sim.la lib/ekg2/plugins/sim.so -lib/ekg2/plugins/sms.la lib/ekg2/plugins/sms.so -lib/ekg2/plugins/xmsg.la lib/ekg2/plugins/xmsg.so %%XOSD%%lib/ekg2/plugins/xosd.so -%%XOSD%%lib/ekg2/plugins/xosd.la %%PERL%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Ekg2.bs %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Ekg2.so Modified: head/polish/gnugadu2/Makefile ============================================================================== --- head/polish/gnugadu2/Makefile Tue May 27 10:55:39 2014 (r355485) +++ head/polish/gnugadu2/Makefile Tue May 27 11:17:41 2014 (r355486) @@ -3,7 +3,7 @@ PORTNAME= gnugadu2 PORTVERSION= 2.3.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= polish net-im MASTER_SITES= SF/ggadu/gg2/${PORTVERSION} DISTNAME= gg2-${PORTVERSION} @@ -16,8 +16,7 @@ LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/l GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USE_BZIP2= yes -USES= gettext gmake perl5 pkgconfig +USES= gettext gmake perl5 pkgconfig tar:bzip2 libtool USE_GNOME= gtk20 USE_LDCONFIG= yes USE_XORG= x11 xaw ice xscrnsaver @@ -57,7 +56,6 @@ XOSD_DESC= Enable On-Screen-Display mess #.if ${${HAVE_GNOME:Mesound}!="" && empty(PORT_OPTIONS:MESOUND) -NO_STAGE= yes .include # can't change this untile HAVE_GNOME has been fixed .if ${PORT_OPTIONS:MAUTODETECT} @@ -152,7 +150,7 @@ post-patch: @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' ${WRKSRC}/src/plugins/GUI/gtkimhtml.c post-install: - ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${PREFIX}/share/applications/ + ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${STAGEDIR}${PREFIX}/share/applications/ # vim: set ts=8 sw=8: .include Modified: head/polish/gnugadu2/pkg-plist ============================================================================== --- head/polish/gnugadu2/pkg-plist Tue May 27 10:55:39 2014 (r355485) +++ head/polish/gnugadu2/pkg-plist Tue May 27 11:17:41 2014 (r355486) @@ -1,41 +1,25 @@ bin/gg2 bin/gghist include/gg2_core.h -lib/gg2/libGUI_plugin.la lib/gg2/libGUI_plugin.so -lib/gg2/libaaway_plugin.la lib/gg2/libaaway_plugin.so -%%DBUS:%%lib/gg2/libdbus_plugin.la %%DBUS:%%lib/gg2/libdbus_plugin.so -%%DOCKAPP:%%lib/gg2/libdocklet_dockapp_plugin.la %%DOCKAPP:%%lib/gg2/libdocklet_dockapp_plugin.so -%%DOCKLET:%%lib/gg2/libdocklet_system_tray_plugin.la %%DOCKLET:%%lib/gg2/libdocklet_system_tray_plugin.so -lib/gg2/libgadu_gadu_plugin.la lib/gg2/libgadu_gadu_plugin.so -lib/gg2/libhistory_external_plugin.la lib/gg2/libhistory_external_plugin.so -lib/gg2/libignore_main_plugin.la lib/gg2/libignore_main_plugin.so -%%JABBER:%%lib/gg2/libjabber_plugin.la %%JABBER:%%lib/gg2/libjabber_plugin.so -lib/gg2/libsms_plugin.la lib/gg2/libsms_plugin.so -%%ESOUND:%%lib/gg2/libsound_esd_plugin.la %%ESOUND:%%lib/gg2/libsound_esd_plugin.so -lib/gg2/libsound_external_plugin.la lib/gg2/libsound_external_plugin.so -lib/gg2/libsound_oss_plugin.la lib/gg2/libsound_oss_plugin.so -%%TLEN:%%lib/gg2/libtlen_plugin.la %%TLEN:%%lib/gg2/libtlen_plugin.so -lib/gg2/libupdate_plugin.la lib/gg2/libupdate_plugin.so -%%XOSD:%%lib/gg2/libxosd_plugin.la %%XOSD:%%lib/gg2/libxosd_plugin.so -lib/libgg2_core.la lib/libgg2_core.so lib/libgg2_core.so.2 +lib/libgg2_core.so.2.0.2 libdata/pkgconfig/gg2_core.pc %%DBUS:%%share/dbus-1/services/org.freedesktop.im.GG.service share/applications/gg2.desktop Modified: head/sysutils/lineak-xosdplugin/Makefile ============================================================================== --- head/sysutils/lineak-xosdplugin/Makefile Tue May 27 10:55:39 2014 (r355485) +++ head/sysutils/lineak-xosdplugin/Makefile Tue May 27 11:17:41 2014 (r355486) @@ -3,7 +3,7 @@ PORTNAME= lineak-xosdplugin PORTVERSION= 0.9 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils deskutils MASTER_SITES= SF/lineak/lineak_xosdplugin/${PORTNAME}-${PORTVERSION} DIST_SUBDIR= lineak @@ -17,18 +17,16 @@ LIB_DEPENDS= libxosd.so:${PORTSDIR}/misc liblineak.so:${PORTSDIR}/sysutils/lineakd USE_XORG= x11 xext xt -USE_GMAKE= yes +USES= gmake libtool GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_xosd_config_script="${TRUE}" USE_LDCONFIG= yes -CFLAGS+= -fPIC +CFLAGS+= -fPIC CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= lineak_xosdplugin.1 -PLIST_FILES= lib/lineakd/plugins/xosdplugin.la \ - lib/lineakd/plugins/xosdplugin.so \ +PLIST_FILES= lib/lineakd/plugins/xosdplugin.so \ man/man1/lineak_xosdplugin.1.gz post-patch: Modified: head/sysutils/nbosd/Makefile ============================================================================== --- head/sysutils/nbosd/Makefile Tue May 27 10:55:39 2014 (r355485) +++ head/sysutils/nbosd/Makefile Tue May 27 11:17:41 2014 (r355486) @@ -3,7 +3,7 @@ PORTNAME= nbosd PORTVERSION= 0.5.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MASTER_SITES= http://bsd-geek.de/FreeBSD/distfiles/ Modified: head/x11-clocks/osdclock/Makefile ============================================================================== --- head/x11-clocks/osdclock/Makefile Tue May 27 10:55:39 2014 (r355485) +++ head/x11-clocks/osdclock/Makefile Tue May 27 11:17:41 2014 (r355486) @@ -3,7 +3,7 @@ PORTNAME= osdclock PORTVERSION= 0.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-clocks MASTER_SITES= http://leftorium.net/software/ \ ${MASTER_SITE_LOCAL} @@ -13,7 +13,7 @@ DISTNAME= osd_clock-${PORTVERSION} MAINTAINER= novel@FreeBSD.org COMMENT= Small clock which uses libxosd to render text to the root window -LIB_DEPENDS= xosd.4:${PORTSDIR}/misc/xosd +LIB_DEPENDS= libxosd.so:${PORTSDIR}/misc/xosd MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \