aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorolivierd <olivierd@FreeBSD.org>2013-05-08 23:53:18 +0800
committerolivierd <olivierd@FreeBSD.org>2013-05-08 23:53:18 +0800
commit381af66da468a59600f8bf89a5b94ffaff519a44 (patch)
tree17c0c92303486319b7ccb82ecec0d018c35913b4
parentf36dc666817e7880799034d360e1b3b6076c46be (diff)
downloadfreebsd-ports-gnome-381af66da468a59600f8bf89a5b94ffaff519a44.tar.gz
freebsd-ports-gnome-381af66da468a59600f8bf89a5b94ffaff519a44.tar.zst
freebsd-ports-gnome-381af66da468a59600f8bf89a5b94ffaff519a44.zip
- Finish to convert USES
- Replace post-patch target by patch ( configure script)
-rw-r--r--x11/libexo/Makefile16
-rw-r--r--x11/libexo/files/patch-configure15
-rw-r--r--x11/libexo/pkg-plist2
3 files changed, 15 insertions, 18 deletions
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 482a8ed117fa..25f0ca401e46 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libexo
PORTVERSION= 0.10.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/xfce/exo/${PORTVERSION:R}
@@ -24,14 +24,12 @@ GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack glib20 gtk20 intltool intlhack desktopfileutils
+USE_GNOME= glib20 gtk20 intltool intlhack
USE_LDCONFIG= yes
USE_PERL5= yes
USE_XFCE= configenv libmenu libutil
USE_XORG= x11
-USES= pkgconfig
-
-CONFIGURE_ARGS+=--disable-gtk-doc-html
+USES= desktop-file-utils pathfix pkgconfig
OPTIONS_DEFINE= DOCS NLS
@@ -56,12 +54,4 @@ CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.endif
-post-patch:
-.if empty(PORT_OPTIONS:MNLS)
- @${REINPLACE_CMD} -e 's| po||' ${WRKSRC}/Makefile.in
-.endif
-
-post-install:
- @-update-desktop-database
-
.include <bsd.port.mk>
diff --git a/x11/libexo/files/patch-configure b/x11/libexo/files/patch-configure
index 290827fa9ebb..367b6553c4ec 100644
--- a/x11/libexo/files/patch-configure
+++ b/x11/libexo/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2010-01-14 17:33:27.000000000 +0100
-+++ configure 2010-01-14 17:35:47.000000000 +0100
-@@ -746,6 +746,9 @@
+--- ./configure.orig 2012-12-27 12:50:36.000000000 +0000
++++ ./configure 2013-05-05 20:55:42.000000000 +0000
+@@ -633,6 +633,9 @@
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -10,3 +10,12 @@
#endif"
ac_header_list=
+@@ -13802,7 +13805,7 @@
+
+ fi
+ fi
+- USE_NLS=yes
++# USE_NLS=yes
+
+
+ gt_cv_have_gettext=no
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index 1db252f73067..b7314c6ca40d 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -207,5 +207,3 @@ share/xfce4/helpers/xterm.desktop
@dirrm include/exo-1
@dirrmtry etc/xdg/xfce4
@dirrmtry etc/xdg
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true