[Midnightbsd-cvs] mports [20829] trunk/x11-toolkits/libxfce4gui: tweak build

[laffer1 at midnightbsd.org]

Revision: 20829
          http://svnweb.midnightbsd.org/mports/?rev=20829
Author:   laffer1
Date:     2015-11-12 23:37:16 -0500 (Thu, 12 Nov 2015)
Log Message:
-----------
tweak build

Modified Paths:
--------------
    trunk/x11-toolkits/libxfce4gui/Makefile

Added Paths:
-----------
    trunk/x11-toolkits/libxfce4gui/files/
    trunk/x11-toolkits/libxfce4gui/files/patch-configure
    trunk/x11-toolkits/libxfce4gui/files/patch-libxfcegui4__xfce-exec.c

Modified: trunk/x11-toolkits/libxfce4gui/Makefile
===================================================================
--- trunk/x11-toolkits/libxfce4gui/Makefile	2015-11-13 04:35:08 UTC (rev 20828)
+++ trunk/x11-toolkits/libxfce4gui/Makefile	2015-11-13 04:37:16 UTC (rev 20829)
@@ -2,10 +2,9 @@
 
 PORTNAME=	libxfce4gui
 PORTVERSION=	4.10.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits xfce
-MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/archive/libxfcegui4/${PORTVERSION:R}
+MASTER_SITES=	XFCE/src/archive/libxfcegui4/${PORTVERSION:R}
 DISTNAME=	libxfcegui4-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
@@ -16,42 +15,22 @@
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
+USES=		gmake libtool pathfix pkgconfig gettext-tools xfce tar:bzip2
 USE_GNOME=	gtk20 intltool intlhack libglade2
 USE_LDCONFIG=	yes
 USE_XFCE=	libutil
 USE_XORG=	sm x11
-USES=		pathfix pkgconfig libtool tar:bzip2 gmake gettext-tools
 
-CONFIGURE_ARGS+=--disable-gtk-doc-html
+CONFIGURE_ARGS+=--disable-gladeui --disable-static \
+	--without-html-dir
 
-OPTIONS_DEFINE=		DOCS NLS STARTUP
-OPTIONS_DEFAULT=	STARTUP
-STARTUP_DESC=		Use libstartup-notification
+OPTIONS_DEFINE=		NLS STARTUP
+OPTIONS_DEFAULT=	NLS STARTUP
+STARTUP_DESC=	Startup notification
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+STARTUP_CONFIGURE_ENABLE=	startup-notification
+OPTIONS_SUB=	yes
 
-.include <bsd.mport.options.mk>
-
-.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:MSTARTUP}
-LIB_DEPENDS+=	startup-notification-1:${PORTSDIR}/x11/startup-notification
-CONFIGURE_ARGS+=--enable-startup-notification
-.else
-CONFIGURE_ARGS+=--disable-startup-notification
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	APIDOCS=""
-.else
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.endif
-
 .include <bsd.port.mk>

Added: trunk/x11-toolkits/libxfce4gui/files/patch-configure
===================================================================
--- trunk/x11-toolkits/libxfce4gui/files/patch-configure	                        (rev 0)
+++ trunk/x11-toolkits/libxfce4gui/files/patch-configure	2015-11-13 04:37:16 UTC (rev 20829)
@@ -0,0 +1,11 @@
+--- ./configure.orig	2012-04-28 20:10:47.000000000 +0000
++++ ./configure	2013-10-21 18:18:01.000000000 +0000
+@@ -13165,7 +13165,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++     #USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no


Property changes on: trunk/x11-toolkits/libxfce4gui/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-toolkits/libxfce4gui/files/patch-libxfcegui4__xfce-exec.c
===================================================================
--- trunk/x11-toolkits/libxfce4gui/files/patch-libxfcegui4__xfce-exec.c	                        (rev 0)
+++ trunk/x11-toolkits/libxfce4gui/files/patch-libxfcegui4__xfce-exec.c	2015-11-13 04:37:16 UTC (rev 20829)
@@ -0,0 +1,11 @@
+--- ./libxfcegui4/xfce-exec.c.orig	2012-04-28 20:10:43.000000000 +0000
++++ ./libxfcegui4/xfce-exec.c	2014-03-24 21:25:39.000000000 +0000
+@@ -79,7 +79,7 @@
+ #ifndef G_OS_WIN32
+     gchar *dpyname = user_data;
+     
+-    xfce_setenv ("DISPLAY", dpyname, TRUE);
++    g_setenv ("DISPLAY", dpyname, TRUE);
+ #endif
+ }
+ 


Property changes on: trunk/x11-toolkits/libxfce4gui/files/patch-libxfcegui4__xfce-exec.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property