[Midnightbsd-cvs] mports [19307] trunk/sysutils/xfce4-settings: xfce4 settings 4.12

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Jun 1 22:14:18 EDT 2015


Revision: 19307
          http://svnweb.midnightbsd.org/mports/?rev=19307
Author:   laffer1
Date:     2015-06-01 22:14:17 -0400 (Mon, 01 Jun 2015)
Log Message:
-----------
xfce4 settings 4.12

Modified Paths:
--------------
    trunk/sysutils/xfce4-settings/Makefile
    trunk/sysutils/xfce4-settings/distinfo
    trunk/sysutils/xfce4-settings/pkg-descr
    trunk/sysutils/xfce4-settings/pkg-plist

Removed Paths:
-------------
    trunk/sysutils/xfce4-settings/files/patch-dialogs__appearance-settings__appearance-install-theme

Modified: trunk/sysutils/xfce4-settings/Makefile
===================================================================
--- trunk/sysutils/xfce4-settings/Makefile	2015-06-02 02:12:49 UTC (rev 19306)
+++ trunk/sysutils/xfce4-settings/Makefile	2015-06-02 02:14:17 UTC (rev 19307)
@@ -1,11 +1,9 @@
 # $MidnightBSD$
 
 PORTNAME=	xfce4-settings
-PORTVERSION=	4.10.1
-PORTREVISION=	1
+PORTVERSION=	4.12.0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -12,80 +10,40 @@
 COMMENT=	Xfce 4 settings application
 
 LICENSE=	gpl2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+	libxklavier.so:${PORTSDIR}/x11/libxklavier
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack
-USE_XFCE=	configenv garcon libexo libmenu libutil xfconf
-USE_XORG=	inputproto x11 xi
-USES=		libtool pathfix pkgconfig gmake tar:bzip2
+USE_XFCE=	garcon libexo
+USE_XORG=	inputproto x11 xcursor xi xrandr
+USES=		libtool pkgconfig gmake gettext-tools xfce tar:bzip2
 
-CONFIGURE_ARGS=	--enable-pluggable-dialogs \
-		--enable-gio-unix
+CONFIGURE_ARGS=--enable-debug=yes \
+		--disable-xorg-libinput
 
-OPTIONS_DEFINE=		XKLAVIER XCURSOR XRANDR NOTIFY NLS SOUND
-OPTIONS_DEFAULT=	XKLAVIER XCURSOR XRANDR NOTIFY NLS
-SOUND_DESC=		Enable sound control
+OPTIONS_DEFINE=		NOTIFY NLS UPOWER
+OPTIONS_DEFAULT=	NOTIFY NLS
 
-.include <bsd.mport.options.mk>
+UPOWER_DESC=	Power management tasks
 
-.if ${PORT_OPTIONS:MXKLAVIER}
-LIB_DEPENDS+=	xklavier:${PORTSDIR}/x11/libxklavier
-CONFIGURE_ARGS+=--enable-libxklavier
-.else
-CONFIGURE_ARGS+=--disable-libxklavier
-.endif
+NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_CONFIGURE_ENABLE=	libnotify
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext-runtime
+UPOWER_LIB_DEPENDS=	libupower-glib.so:${PORTSDIR}/sysutils/upower
+UPOWER_CONFIGURE_ENABLE=	upower-glib
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MXCURSOR}
-USE_XORG+=	xcursor
-CONFIGURE_ARGS+=--enable-xcursor
-.else
-CONFIGURE_ARGS+=--disable-xcursor
-.endif
-
-.if ${PORT_OPTIONS:MXRANDR}
-USE_XORG+=	xrandr
-CONFIGURE_ARGS+=--enable-xrandr
-PLIST_SUB+=	XRANDR=""
-.else
-CONFIGURE_ARGS+=--disable-xrandr
-PLIST_SUB+=	XRANDR="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
-CONFIGURE_ARGS+=--enable-libnotify
-.else
-CONFIGURE_ARGS+=--disable-libnotify
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSOUND}
-LIB_DEPENDS+=	canberra:${PORTSDIR}/audio/libcanberra
-CONFIGURE_ARGS+=--enable-sound-settings
-.else
-CONFIGURE_ARGS+=--disable-sound-settings
-.endif
-
 post-patch:
-	# until xfce4-icon-theme is back we rely on Tango
-	@${REINPLACE_CMD} -e 's|Rodent|Tango|g' \
+	@${REINPLACE_CMD} -e 's|Rodent|Adwaita|g' \
 		${WRKSRC}/dialogs/appearance-settings/main.c
-	@${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="Tango|; \
+	@${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="Adwaita|; \
 		s|"ThemeName" type="empty|"ThemeName" type="string" value="Xfce|' \
 		${WRKSRC}/xfsettingsd/xsettings.xml
-	@${REINPLACE_CMD} -e 's|xkl_config_registry_load (settings->priv->xkl_registry)|xkl_config_registry_load (settings->priv->xkl_registry, FALSE)|g; \
-		s|xkl_engine_stop_listen (settings->priv->xkl_engine)|xkl_engine_stop_listen (settings->priv->xkl_engine, FALSE)|g' \
-		${WRKSRC}/dialogs/keyboard-settings/xfce-keyboard-settings.c
 
 .include <bsd.port.mk>

Modified: trunk/sysutils/xfce4-settings/distinfo
===================================================================
--- trunk/sysutils/xfce4-settings/distinfo	2015-06-02 02:12:49 UTC (rev 19306)
+++ trunk/sysutils/xfce4-settings/distinfo	2015-06-02 02:14:17 UTC (rev 19307)
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-settings-4.10.1.tar.bz2) = 118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5
-SIZE (xfce4/xfce4-settings-4.10.1.tar.bz2) = 777735
+SHA256 (xfce4/xfce4-settings-4.12.0.tar.bz2) = 04becef105c19d0266cfe8dbf42619e7233c3b9fa99b43dbfc9c6a5959501f81
+SIZE (xfce4/xfce4-settings-4.12.0.tar.bz2) = 973324

Deleted: trunk/sysutils/xfce4-settings/files/patch-dialogs__appearance-settings__appearance-install-theme
===================================================================
--- trunk/sysutils/xfce4-settings/files/patch-dialogs__appearance-settings__appearance-install-theme	2015-06-02 02:12:49 UTC (rev 19306)
+++ trunk/sysutils/xfce4-settings/files/patch-dialogs__appearance-settings__appearance-install-theme	2015-06-02 02:14:17 UTC (rev 19307)
@@ -1,15 +0,0 @@
---- ./dialogs/appearance-settings/appearance-install-theme.orig	2013-05-05 16:12:54.000000000 +0000
-+++ ./dialogs/appearance-settings/appearance-install-theme	2013-05-05 23:09:09.000000000 +0000
-@@ -89,7 +89,11 @@
- 
- # check file size, abort if bigger then 50Mb, only works for files
- if test x"`which stat 2>/dev/null`" != x""; then
--    dndsize=`stat -c %s "$dndfilename"`
-+    if test "`uname -s`" = "Linux"; then
-+        dndsize=`stat -c %s "$dndfilename"`
-+    elif test "`uname -s`" = "FreeBSD"; then
-+        dndsize=`stat -f %z "$dndfilename"`
-+    fi
-     if test "$dndsize" -gt 52428800; then
-         # 2: File too big
-         exit 2

Modified: trunk/sysutils/xfce4-settings/pkg-descr
===================================================================
--- trunk/sysutils/xfce4-settings/pkg-descr	2015-06-02 02:12:49 UTC (rev 19306)
+++ trunk/sysutils/xfce4-settings/pkg-descr	2015-06-02 02:14:17 UTC (rev 19307)
@@ -1,4 +1,4 @@
 The settings manager allows you to configure every detail of your desktop
 environment.
 
-WWW: http://docs.xfce.org/xfce/xfce4-settings/start
+WWW: http://www.xfce.org/

Modified: trunk/sysutils/xfce4-settings/pkg-plist
===================================================================
--- trunk/sysutils/xfce4-settings/pkg-plist	2015-06-02 02:12:49 UTC (rev 19306)
+++ trunk/sysutils/xfce4-settings/pkg-plist	2015-06-02 02:14:17 UTC (rev 19307)
@@ -1,6 +1,6 @@
 bin/xfce4-accessibility-settings
 bin/xfce4-appearance-settings
-%%XRANDR%%bin/xfce4-display-settings
+bin/xfce4-display-settings
 bin/xfce4-keyboard-settings
 bin/xfce4-mime-settings
 bin/xfce4-mouse-settings
@@ -11,7 +11,7 @@
 etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
 etc/xdg/menus/xfce-settings-manager.menu
 lib/xfce4/settings/appearance-install-theme
-%%XRANDR%%share/applications/xfce-display-settings.desktop
+share/applications/xfce-display-settings.desktop
 share/applications/xfce-keyboard-settings.desktop
 share/applications/xfce4-mime-settings.desktop
 share/applications/xfce-mouse-settings.desktop
@@ -19,6 +19,10 @@
 share/applications/xfce-ui-settings.desktop
 share/applications/xfce4-accessibility-settings.desktop
 share/applications/xfce4-settings-editor.desktop
+share/icons/hicolor/128x128/devices/xfce-display-extend.png
+share/icons/hicolor/128x128/devices/xfce-display-external.png
+share/icons/hicolor/128x128/devices/xfce-display-internal.png
+share/icons/hicolor/128x128/devices/xfce-display-mirror.png
 %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-settings.mo
@@ -28,6 +32,7 @@
 %%NLS%%share/locale/da/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/el/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-settings.mo
@@ -45,9 +50,11 @@
 %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-settings.mo
@@ -56,9 +63,11 @@
 %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/si/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/te/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-settings.mo
@@ -65,23 +74,5 @@
 %%NLS%%share/locale/ur/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-settings.mo
-%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur_PK
-%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur
-%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/te
-%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/si
-%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ast
- at dirrmtry lib/xfce4/settings
- at dirrmtry etc/xdg/xfce4/xfconf/xfce-perchannel-xml
- at dirrmtry etc/xdg/xfce4/xfconf
- at dirrmtry etc/xdg/xfce4
- at dirrmtry etc/xdg/menus



More information about the Midnightbsd-cvs mailing list