aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2001-01-12 22:20:34 +0800
committersobomax <sobomax@FreeBSD.org>2001-01-12 22:20:34 +0800
commita22fbb5f4585a6b3e64de8c459b55af249291adc (patch)
tree72f09506f1ce14b2e2fd571f0f33a22987074219
parent342d0415479e690958b1560e954529d943187cd8 (diff)
downloadfreebsd-ports-gnome-a22fbb5f4585a6b3e64de8c459b55af249291adc.tar.gz
freebsd-ports-gnome-a22fbb5f4585a6b3e64de8c459b55af249291adc.tar.zst
freebsd-ports-gnome-a22fbb5f4585a6b3e64de8c459b55af249291adc.zip
Fix several hardcoded paths. This should improve port's behaviour, so bump
PORTREVISION.
-rw-r--r--x11-wm/wmakerconf/Makefile5
-rw-r--r--x11-wm/wmakerconf/files/patch-data_WMWmakerconf58
-rw-r--r--x11-wm/wmakerconf/files/patch-data_WMWmakerconf.gettext58
3 files changed, 121 insertions, 0 deletions
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 59b14af9eac2..718ebcef23f7 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmakerconf
PORTVERSION= 2.7
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://ulli.linuxave.net/wmakerconf/
@@ -41,4 +42,8 @@ PLIST_SUB+= GNOME:=""
PLIST_SUB+= GNOME:="@comment "
.endif
+post-configure:
+ @${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}| ; s|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${WRKSRC}/data/WMWmakerconf.gettext ${WRKSRC}/data/WMWmakerconf
+
.include <bsd.port.post.mk>
diff --git a/x11-wm/wmakerconf/files/patch-data_WMWmakerconf b/x11-wm/wmakerconf/files/patch-data_WMWmakerconf
new file mode 100644
index 000000000000..8c3f21936306
--- /dev/null
+++ b/x11-wm/wmakerconf/files/patch-data_WMWmakerconf
@@ -0,0 +1,58 @@
+
+$FreeBSD$
+
+--- data/WMWmakerconf 2001/01/12 13:53:53 1.1
++++ data/WMWmakerconf 2001/01/12 13:56:24
+@@ -537,13 +537,13 @@
+ Default = (
+ "~/GNUstep/Library/WindowMaker/Pixmaps",
+ "~/GNUstep/Library/WindowMaker/Backgrounds",
+- "/usr/share/WindowMaker/Pixmaps",
+- "/usr/share/WindowMaker/Backgrounds",
+- "/usr/local/share/WindowMaker/Pixmaps",
+- "/usr/local/share/WindowMaker/Backgrounds",
+- "/usr/X11R6/include/X11/pixmaps",
+- "/usr/local/share/pixmaps",
+- "/usr/share/pixmaps"
++ "%%X11BASE%%/share/WindowMaker/Pixmaps",
++ "%%X11BASE%%/share/WindowMaker/Backgrounds",
++ "%%LOCALBASE%%/share/WindowMaker/Pixmaps",
++ "%%LOCALBASE%%/share/WindowMaker/Backgrounds",
++ "%%X11BASE%%/include/X11/pixmaps",
++ "%%LOCALBASE%%/share/pixmaps",
++ "%%X11BASE%%/share/pixmaps"
+ );
+ Range = ();
+ };
+@@ -555,13 +555,13 @@
+ Default = (
+ "~/GNUstep/Library/Icons",
+ "~/GNUstep/Library/WindowMaker/Pixmaps",
+- "/usr/share/WindowMaker/Icons",
+- "/usr/share/WindowMaker/Pixmaps",
+- "/usr/local/share/WindowMaker/Icons",
+- "/usr/local/share/WindowMaker/Pixmaps",
+- "/usr/X11R6/include/X11/pixmaps",
+- "/usr/local/share/pixmaps",
+- "/usr/share/pixmaps"
++ "%%X11BASE%%/share/WindowMaker/Icons",
++ "%%X11BASE%%/share/WindowMaker/Pixmaps",
++ "%%LOCALBASE%%/share/WindowMaker/Icons",
++ "%%LOCALBASE%%/share/WindowMaker/Pixmaps",
++ "%%X11BASE%%/include/X11/pixmaps",
++ "%%LOCALBASE%%/share/pixmaps",
++ "%%X11BASE%%/share/pixmaps"
+ );
+ Range = ();
+ };
+@@ -571,8 +571,8 @@
+ Info = "Wmakerconf searches each of these paths in order for the list of available themes.";
+ Title = "Theme search paths";
+ Default = (
+- "/usr/share/WindowMaker/Themes",
+- "/usr/local/share/WindowMaker/Themes",
++ "%%X11BASE%%/share/WindowMaker/Themes",
++ "%%LOCALBASE%%/share/WindowMaker/Themes",
+ "~/GNUstep/Library/WindowMaker/Themes"
+ );
+ Range = ();
diff --git a/x11-wm/wmakerconf/files/patch-data_WMWmakerconf.gettext b/x11-wm/wmakerconf/files/patch-data_WMWmakerconf.gettext
new file mode 100644
index 000000000000..2f01d91bbd81
--- /dev/null
+++ b/x11-wm/wmakerconf/files/patch-data_WMWmakerconf.gettext
@@ -0,0 +1,58 @@
+
+$FreeBSD$
+
+--- data/WMWmakerconf.gettext 2001/01/12 13:54:02 1.1
++++ data/WMWmakerconf.gettext 2001/01/12 13:56:24
+@@ -619,13 +619,13 @@
+ Default = (
+ "~/GNUstep/Library/WindowMaker/Pixmaps",
+ "~/GNUstep/Library/WindowMaker/Backgrounds",
+- "/usr/share/WindowMaker/Pixmaps",
+- "/usr/share/WindowMaker/Backgrounds",
+- "/usr/local/share/WindowMaker/Pixmaps",
+- "/usr/local/share/WindowMaker/Backgrounds",
+- "/usr/X11R6/include/X11/pixmaps",
+- "/usr/local/share/pixmaps",
+- "/usr/share/pixmaps"
++ "%%X11BASE%%/share/WindowMaker/Pixmaps",
++ "%%X11BASE%%/share/WindowMaker/Backgrounds",
++ "%%LOCALBASE%%/share/WindowMaker/Pixmaps",
++ "%%LOCALBASE%%/share/WindowMaker/Backgrounds",
++ "%%X11BASE%%/include/X11/pixmaps",
++ "%%LOCALBASE%%/share/pixmaps",
++ "%%X11BASE%%/share/pixmaps"
+ );
+ Range = ();
+ };
+@@ -639,13 +639,13 @@
+ Default = (
+ "~/GNUstep/Library/Icons",
+ "~/GNUstep/Library/WindowMaker/Pixmaps",
+- "/usr/share/WindowMaker/Icons",
+- "/usr/share/WindowMaker/Pixmaps",
+- "/usr/local/share/WindowMaker/Icons",
+- "/usr/local/share/WindowMaker/Pixmaps",
+- "/usr/X11R6/include/X11/pixmaps",
+- "/usr/local/share/pixmaps",
+- "/usr/share/pixmaps"
++ "%%X11BASE%%/share/WindowMaker/Icons",
++ "%%X11BASE%%/share/WindowMaker/Pixmaps",
++ "%%LOCALBASE%%/share/WindowMaker/Icons",
++ "%%LOCALBASE%%/share/WindowMaker/Pixmaps",
++ "%%X11BASE%%/include/X11/pixmaps",
++ "%%LOCALBASE%%/share/pixmaps",
++ "%%X11BASE%%/share/pixmaps"
+ );
+ Range = ();
+ };
+@@ -657,8 +657,8 @@
+ /* Title: ThemePath */
+ Title = _("Theme search paths");
+ Default = (
+- "/usr/share/WindowMaker/Themes",
+- "/usr/local/share/WindowMaker/Themes",
++ "%%X11BASE%%/share/WindowMaker/Themes",
++ "%%LOCALBASE%%/share/WindowMaker/Themes",
+ "~/GNUstep/Library/WindowMaker/Themes"
+ );
+ Range = ();