aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornakai <nakai@FreeBSD.org>2001-08-10 13:25:39 +0800
committernakai <nakai@FreeBSD.org>2001-08-10 13:25:39 +0800
commit1cbea66deaa5aba922592c9c85a04982274e7c70 (patch)
treef8c8779e9d4bb1179fec0d64f611028d35615a10
parenteecf8fe95c35c4dc39d50087f5daf7971d8f18e5 (diff)
downloadfreebsd-ports-gnome-1cbea66deaa5aba922592c9c85a04982274e7c70.tar.gz
freebsd-ports-gnome-1cbea66deaa5aba922592c9c85a04982274e7c70.tar.zst
freebsd-ports-gnome-1cbea66deaa5aba922592c9c85a04982274e7c70.zip
Fix.
PR: ports/29541 Submitted by: Kato Tsuguru
-rw-r--r--x11-wm/xfce/Makefile3
-rw-r--r--x11-wm/xfce/files/patch-ak11
-rw-r--r--x11-wm/xfce4/Makefile3
-rw-r--r--x11-wm/xfce4/files/patch-ak11
4 files changed, 6 insertions, 22 deletions
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index 45fe19918e47..44cd45da6921 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce
PORTVERSION= 3.8.6
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.xfce.org/archive/
@@ -35,6 +36,8 @@ pre-patch:
's|DATADIRNAME=lib|DATADIRNAME=share|g ; \
s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+ @${PERL} -pi -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c
+ @${PERL} -pi -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in
pre-build:
${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}/libtool
diff --git a/x11-wm/xfce/files/patch-ak b/x11-wm/xfce/files/patch-ak
deleted file mode 100644
index 3591d0908c48..000000000000
--- a/x11-wm/xfce/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- xfce/setup.c.orig Sun May 6 08:51:24 2001
-+++ xfce/setup.c Sun May 6 08:51:34 2001
-@@ -132,7 +132,7 @@
- list = g_list_append(list, "xfce");
-
- /* Try to find the location of gtk engines */
-- if ((pdata=popen("gtk-config --prefix","r")) != NULL
-+ if ((pdata=popen("gtk12-config --prefix","r")) != NULL
- && fgets(buffer, sizeof(buffer), pdata) != NULL)
- {
- char *path;
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 45fe19918e47..44cd45da6921 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce
PORTVERSION= 3.8.6
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.xfce.org/archive/
@@ -35,6 +36,8 @@ pre-patch:
's|DATADIRNAME=lib|DATADIRNAME=share|g ; \
s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+ @${PERL} -pi -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c
+ @${PERL} -pi -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in
pre-build:
${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}/libtool
diff --git a/x11-wm/xfce4/files/patch-ak b/x11-wm/xfce4/files/patch-ak
deleted file mode 100644
index 3591d0908c48..000000000000
--- a/x11-wm/xfce4/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- xfce/setup.c.orig Sun May 6 08:51:24 2001
-+++ xfce/setup.c Sun May 6 08:51:34 2001
-@@ -132,7 +132,7 @@
- list = g_list_append(list, "xfce");
-
- /* Try to find the location of gtk engines */
-- if ((pdata=popen("gtk-config --prefix","r")) != NULL
-+ if ((pdata=popen("gtk12-config --prefix","r")) != NULL
- && fgets(buffer, sizeof(buffer), pdata) != NULL)
- {
- char *path;