svn commit: r350914 - in head: deskutils/xfce4-xkb-plugin sysutils/mate-control-center sysutils/mate-settings-daemon sysutils/xfce4-settings x11/gdm x11/gnome-applets x11/libgnomekbd x11/libmatekbd...
Baptiste Daroussin
bapt at FreeBSD.org
Fri Apr 11 09:55:25 UTC 2014
Author: bapt
Date: Fri Apr 11 09:55:21 2014
New Revision: 350914
URL: http://svnweb.freebsd.org/changeset/ports/350914
QAT: https://qat.redports.org/buildarchive/r350914/
Log:
Stageify libxkalvier
USES libtool
Chase libxklavier shlib change
On all ports depending on libxklavier:
- Support stage
- USES=libtool when possible to reduce overlinking
- Support packaging as a user
Modified:
head/deskutils/xfce4-xkb-plugin/Makefile
head/sysutils/mate-control-center/Makefile
head/sysutils/mate-settings-daemon/Makefile
head/sysutils/xfce4-settings/Makefile
head/x11/gdm/Makefile
head/x11/gdm/pkg-plist
head/x11/gnome-applets/Makefile
head/x11/libgnomekbd/Makefile
head/x11/libgnomekbd/pkg-plist
head/x11/libmatekbd/Makefile
head/x11/libmatekbd/pkg-plist
head/x11/libxklavier/Makefile
head/x11/libxklavier/pkg-plist
head/x11/mate-applets/Makefile
Modified: head/deskutils/xfce4-xkb-plugin/Makefile
==============================================================================
--- head/deskutils/xfce4-xkb-plugin/Makefile Fri Apr 11 09:22:39 2014 (r350913)
+++ head/deskutils/xfce4-xkb-plugin/Makefile Fri Apr 11 09:55:21 2014 (r350914)
@@ -2,6 +2,7 @@
PORTNAME= xfce4-xkb-plugin
PORTVERSION= 0.5.6
+PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -12,8 +13,7 @@ COMMENT= Keyboard layout switching plugi
LIB_DEPENDS= libxklavier.so:${PORTSDIR}/x11/libxklavier
GNU_CONFIGURE= yes
-USE_BZIP2= yes
-USES= gettext pkgconfig gmake
+USES= gettext pkgconfig gmake tar:bzip2
USE_GNOME= gtk20 intltool intlhack librsvg2 libwnck
USE_XFCE= configenv libmenu libutil panel
USE_XORG= x11
Modified: head/sysutils/mate-control-center/Makefile
==============================================================================
--- head/sysutils/mate-control-center/Makefile Fri Apr 11 09:22:39 2014 (r350913)
+++ head/sysutils/mate-control-center/Makefile Fri Apr 11 09:55:21 2014 (r350914)
@@ -3,6 +3,7 @@
PORTNAME= mate-control-center
PORTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= sysutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -20,8 +21,7 @@ LIB_DEPENDS= libcanberra-gtk.so:${PORTSD
PORTSCOUT= limitw:1,even
USES= desktop-file-utils gettext gmake pathfix pkgconfig \
- shared-mime-info
-USE_XZ= yes
+ shared-mime-info tar:xz
USE_MATE= desktop docutils libmatekbd marco menus settingsdaemon
USE_XORG= x11 xcursor xext xxf86misc xft xi xrandr xscrnsaver
USE_GNOME= dconf glib20 gnomehier gtk20 intlhack libxml2 librsvg2 \
Modified: head/sysutils/mate-settings-daemon/Makefile
==============================================================================
--- head/sysutils/mate-settings-daemon/Makefile Fri Apr 11 09:22:39 2014 (r350913)
+++ head/sysutils/mate-settings-daemon/Makefile Fri Apr 11 09:55:21 2014 (r350914)
@@ -3,6 +3,7 @@
PORTNAME= mate-settings-daemon
PORTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= sysutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -21,8 +22,7 @@ RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb
PORTSCOUT= limitw:1,even
-USES= gettext gmake pathfix pkgconfig
-USE_XZ= yes
+USES= gettext gmake pathfix pkgconfig tar:xz
USE_MATE= desktop libmatekbd
USE_XORG= xxf86misc
USE_GNOME= dconf glib20 gnomehier gtk20 intlhack
Modified: head/sysutils/xfce4-settings/Makefile
==============================================================================
--- head/sysutils/xfce4-settings/Makefile Fri Apr 11 09:22:39 2014 (r350913)
+++ head/sysutils/xfce4-settings/Makefile Fri Apr 11 09:55:21 2014 (r350914)
@@ -3,6 +3,7 @@
PORTNAME= xfce4-settings
PORTVERSION= 4.10.1
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R}
@@ -13,14 +14,12 @@ COMMENT= Xfce 4 settings application
LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USE_BZIP2= yes
USE_GNOME= glib20 gtk20 intltool intlhack
USE_XFCE= configenv garcon libexo libmenu libutil xfconf
USE_XORG= inputproto x11 xi
-USES= pathfix pkgconfig gmake
+USES= libtool pathfix pkgconfig gmake tar:bzip2
CONFIGURE_ARGS= --enable-pluggable-dialogs \
--enable-gio-unix
Modified: head/x11/gdm/Makefile
==============================================================================
--- head/x11/gdm/Makefile Fri Apr 11 09:22:39 2014 (r350913)
+++ head/x11/gdm/Makefile Fri Apr 11 09:55:21 2014 (r350914)
@@ -14,12 +14,12 @@ COMMENT= GNOME 2 version of xdm display
BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS= ck-connector:${PORTSDIR}/sysutils/consolekit \
- polkit-gtk-1:${PORTSDIR}/sysutils/polkit-gnome \
- execinfo:${PORTSDIR}/devel/libexecinfo \
- upower-glib:${PORTSDIR}/sysutils/upower \
- xklavier:${PORTSDIR}/x11/libxklavier \
- canberra-gtk:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS= libck-connector.so:${PORTSDIR}/sysutils/consolekit \
+ libpolkit-gtk-1.so:${PORTSDIR}/sysutils/polkit-gnome \
+ libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
+ libupower-glib.so:${PORTSDIR}/sysutils/upower \
+ libxklavier.so:${PORTSDIR}/x11/libxklavier \
+ libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
gnome-session:${PORTSDIR}/x11/gnome-session \
@@ -30,13 +30,12 @@ CONFLICTS= gdm-3.[0-9]*
USERS= gdm
GROUPS= gdm
-USE_XZ= yes
USE_LDCONFIG= yes
USE_XORG= dmx dmxproto
INSTALLS_ICONS= yes
USE_RC_SUBR= gdm
USE_GNOME_SUBR= yes
-USES= pathfix gettext gmake pkgconfig
+USES= pathfix gettext gmake pkgconfig tar:xz
USE_GNOME= intlhack gnomehier gconf2 librsvg2 \
gnomedocutils gnomeprefix gnomepanel
GCONF_SCHEMAS= gdm-simple-greeter.schemas
@@ -59,11 +58,10 @@ OPTIONS_DEFINE= IPV6 KEYRING
OPTIONS_DEFAULT=KEYRING
KEYRING_DESC= GnomeKeyring/PAM integration
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MKEYRING}
-LIB_DEPENDS+= gnome-keyring:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS+= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
SUB_LIST+= PAM_KEYRING=
.else
SUB_LIST+= PAM_KEYRING=\#
@@ -76,7 +74,7 @@ CONFIGURE_ARGS+= --disable-ipv6
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
+ @${REINPLACE_CMD} -e '/root:/d; s/1640/0640/g' \
${WRKSRC}/data/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
@@ -91,18 +89,16 @@ post-patch:
post-install:
${INSTALL_DATA} ${WRKSRC}/data/gconf.path \
- ${PREFIX}/share/gdm/gconf.path
+ ${STAGEDIR}${PREFIX}/share/gdm/gconf.path
${INSTALL_DATA} ${WRKSRC}/data/session-setup.entries \
- ${PREFIX}/share/gdm/session-setup.entries
-.if !defined(PACKAGE_BUILDING)
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
+ ${STAGEDIR}${PREFIX}/share/gdm/session-setup.entries
${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \
- ${PREFIX}/etc/gdm/custom.conf.default
- ${MKDIR} ${PREFIX}/share/xsessions
- ${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm
+ ${STAGEDIR}${PREFIX}/etc/gdm/custom.conf.default
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
+ ${INSTALL_DATA} ${WRKDIR}/gdm.pam ${STAGEDIR}${PREFIX}/etc/pam.d/gdm
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
- @${CAT} ${PKGMESSAGE}
+ ${RM} -rf ${STAGEDIR}${ETCDIR}/home/.gconf*
+ ${RM} -f ${STAGEDIR}${ETCDIR}/custom.conf
.include <bsd.port.mk>
Modified: head/x11/gdm/pkg-plist
==============================================================================
--- head/x11/gdm/pkg-plist Fri Apr 11 09:22:39 2014 (r350913)
+++ head/x11/gdm/pkg-plist Fri Apr 11 09:55:21 2014 (r350914)
@@ -220,7 +220,6 @@ share/pixmaps/nohost.png
@dirrm %%DATADIR%%/autostart/LoginWindow
@dirrm %%DATADIR%%/autostart
@dirrm %%DATADIR%%
- at dirrm etc/gdm/Sessions
@dirrm etc/gdm/PreSession
@dirrm etc/gdm/PostSession
@dirrm etc/gdm/PostLogin
@@ -231,10 +230,6 @@ share/pixmaps/nohost.png
@unexec rm -rf %D/etc/gdm/home/.gconf*
@dirrmtry etc/gdm/home
@dirrmtry etc/gdm
- at dirrmtry etc/dm/Sessions
- at dirrmtry etc/dm
- at dirrmtry share/log/gdm
- at dirrmtry share/log
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -293,3 +288,11 @@ share/pixmaps/nohost.png
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+ at exec install -d -o root -g gdm /var/run/gdm /var/run/gdm/greeter /var/cache/gdm /var/log/gdm /var/gdm
+ at group gdm
+ at dirrmtry /var/run/gdm/greeter
+ at dirrmtry /var/run/gdm
+ at dirrmtry /var/log/gdm
+ at dirrmtry /var/cache/gdm
+ at dirrmtry /var/gdm
+ at group wheel
Modified: head/x11/gnome-applets/Makefile
==============================================================================
--- head/x11/gnome-applets/Makefile Fri Apr 11 09:22:39 2014 (r350913)
+++ head/x11/gnome-applets/Makefile Fri Apr 11 09:55:21 2014 (r350914)
@@ -4,7 +4,7 @@
PORTNAME= gnome-applets
PORTVERSION= 2.32.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -14,19 +14,18 @@ COMMENT= Applets components for the GNOM
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
-LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop \
- gweather:${PORTSDIR}/net/libgweather \
- polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
- xklavier:${PORTSDIR}/x11/libxklavier \
- gucharmap:${PORTSDIR}/deskutils/gucharmap
+LIB_DEPENDS= libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
+ libgweather.so:${PORTSDIR}/net/libgweather \
+ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
+ libxklavier.so:${PORTSDIR}/x11/libxklavier \
+ libgucharmap.so:${PORTSDIR}/deskutils/gucharmap
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
-USE_BZIP2= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-USES= pathfix gettext gmake pkgconfig
+USES= libtool pathfix gettext gmake pkgconfig tar:bzip2
USE_GNOME= gnomeprefix intlhack gnomepanel gnomedocutils libgnomekbd
WANT_GNOME= yes
USE_GSTREAMER= yes
@@ -43,12 +42,11 @@ GCONF_SCHEMAS= charpick.schemas drivemou
OPTIONS_DEFINE= MINI_COMMANDER NOTIFY
MINI_COMMANDER_DESC= Mini-commander applet
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \
${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify
.endif
.if ${PORT_OPTIONS:MMINI_COMMANDER}
Modified: head/x11/libgnomekbd/Makefile
==============================================================================
--- head/x11/libgnomekbd/Makefile Fri Apr 11 09:22:39 2014 (r350913)
+++ head/x11/libgnomekbd/Makefile Fri Apr 11 09:55:21 2014 (r350914)
@@ -4,7 +4,7 @@
PORTNAME= libgnomekbd
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -12,12 +12,13 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome at FreeBSD.org
COMMENT= GNOME keyboard shared library
-LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS= libxklavier.so:${PORTSDIR}/x11/libxklavier
-USE_GNOME= gnomeprefix gnomehack ltverhack gconf2
-USE_AUTOTOOLS= libtool
+GNU_CONFIGURE= yes
+USE_GNOME= gnomeprefix gconf2
INSTALLS_ICONS= yes
-USES= gettext pkgconfig gmake tar:bzip2
+INSTALL_TARGET= install-strip
+USES= gettext libtool pathfix pkgconfig gmake tar:bzip2
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
Modified: head/x11/libgnomekbd/pkg-plist
==============================================================================
--- head/x11/libgnomekbd/pkg-plist Fri Apr 11 09:22:39 2014 (r350913)
+++ head/x11/libgnomekbd/pkg-plist Fri Apr 11 09:55:21 2014 (r350914)
@@ -11,10 +11,12 @@ lib/libgnomekbd.a
lib/libgnomekbd.la
lib/libgnomekbd.so
lib/libgnomekbd.so.4
+lib/libgnomekbd.so.4.2.0
lib/libgnomekbdui.a
lib/libgnomekbdui.la
lib/libgnomekbdui.so
lib/libgnomekbdui.so.4
+lib/libgnomekbdui.so.4.2.0
libdata/pkgconfig/libgnomekbd.pc
libdata/pkgconfig/libgnomekbdui.pc
share/applications/gkbd-indicator-plugins-capplet.desktop
Modified: head/x11/libmatekbd/Makefile
==============================================================================
--- head/x11/libmatekbd/Makefile Fri Apr 11 09:22:39 2014 (r350913)
+++ head/x11/libmatekbd/Makefile Fri Apr 11 09:55:21 2014 (r350914)
@@ -3,6 +3,7 @@
PORTNAME= libmatekbd
PORTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -14,20 +15,16 @@ LIB_DEPENDS= libxklavier.so:${PORTSDIR}/
PORTSCOUT= limitw:1,even
-USES= gettext gmake pathfix pkgconfig
-USE_XZ= yes
-USE_GNOME= gnomehier glib20 gtk20 intlhack ltverhack
+USES= gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME= gnomehier glib20 gtk20 intlhack
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtk=2.0
INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.mate.peripherals-keyboard-xkb.gschema.xml
-post-install:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmatekbd*.so.4
-
.include <bsd.port.mk>
Modified: head/x11/libmatekbd/pkg-plist
==============================================================================
--- head/x11/libmatekbd/pkg-plist Fri Apr 11 09:22:39 2014 (r350913)
+++ head/x11/libmatekbd/pkg-plist Fri Apr 11 09:55:21 2014 (r350914)
@@ -9,10 +9,12 @@ lib/libmatekbd.a
lib/libmatekbd.la
lib/libmatekbd.so
lib/libmatekbd.so.4
+lib/libmatekbd.so.4.2.0
lib/libmatekbdui.a
lib/libmatekbdui.la
lib/libmatekbdui.so
lib/libmatekbdui.so.4
+lib/libmatekbdui.so.4.2.0
libdata/pkgconfig/libmatekbd.pc
libdata/pkgconfig/libmatekbdui.pc
share/MateConf/gsettings/matekbd.convert
Modified: head/x11/libxklavier/Makefile
==============================================================================
--- head/x11/libxklavier/Makefile Fri Apr 11 09:22:39 2014 (r350913)
+++ head/x11/libxklavier/Makefile Fri Apr 11 09:55:21 2014 (r350914)
@@ -10,19 +10,19 @@ CATEGORIES= x11 gnome
MASTER_SITES= GNOME
MAINTAINER= gnome at FreeBSD.org
-COMMENT= An utility library to make XKB stuff easier
+COMMENT= Utility library to make XKB stuff easier
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
RUN_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp \
${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-USES= pathfix gmake pkgconfig
+USES= libtool pathfix gmake pkgconfig tar:bzip2
USE_XORG= x11 xi xkbfile
-USE_BZIP2= yes
-USE_GNOME= libxml2 glib20 ltverhack:12
+USE_GNOME= libxml2 glib20
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool
+INSTALL_TARGET= install-strip
CPPFLAGS+= -I${LOCALBASE}/include
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-doxygen \
--with-xkb-base=${LOCALBASE}/share/X11/xkb \
--with-xkb-bin-base=${LOCALBASE}/bin \
@@ -33,7 +33,6 @@ LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION=${PORTVERSION}
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's|== "yes|= "yes|g' \
${WRKSRC}/configure
Modified: head/x11/libxklavier/pkg-plist
==============================================================================
--- head/x11/libxklavier/pkg-plist Fri Apr 11 09:22:39 2014 (r350913)
+++ head/x11/libxklavier/pkg-plist Fri Apr 11 09:55:21 2014 (r350914)
@@ -8,7 +8,8 @@ include/libxklavier/xklavier.h
lib/libxklavier.a
lib/libxklavier.la
lib/libxklavier.so
-lib/libxklavier.so.12
+lib/libxklavier.so.16
+lib/libxklavier.so.16.0.0
libdata/pkgconfig/libxklavier.pc
%%DOCSDIR%%/XklConfigItem.html
%%DOCSDIR%%/XklConfigRec.html
Modified: head/x11/mate-applets/Makefile
==============================================================================
--- head/x11/mate-applets/Makefile Fri Apr 11 09:22:39 2014 (r350913)
+++ head/x11/mate-applets/Makefile Fri Apr 11 09:55:21 2014 (r350914)
@@ -3,6 +3,7 @@
PORTNAME= mate-applets
PORTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= x11 mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -21,8 +22,7 @@ LIB_DEPENDS= libgtop-2.0.so:${PORTSDIR}/
PORTSCOUT= limitw:1,even
-USES= gettext gmake pathfix pkgconfig
-USE_XZ= yes
+USES= libtool gettext gmake pathfix pkgconfig tar:xz
USE_MATE= autogen common:build desktop docutils icontheme intlhack \
libmateweather libmatewnck mucharmap panel \
polkit settingsdaemon
More information about the svn-ports-head
mailing list