aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm
diff options
context:
space:
mode:
authorcy <cy@FreeBSD.org>2008-12-13 14:35:51 +0800
committercy <cy@FreeBSD.org>2008-12-13 14:35:51 +0800
commit20cbc903bf677adf3840bc92a139c6fc6fffd954 (patch)
treee6ea97711d0a3538877e157cdb54c89fa87692a3 /x11-wm
parent7509164abc93e42980411fdbb7637af9e42092f6 (diff)
downloadfreebsd-ports-gnome-20cbc903bf677adf3840bc92a139c6fc6fffd954.tar.gz
freebsd-ports-gnome-20cbc903bf677adf3840bc92a139c6fc6fffd954.tar.zst
freebsd-ports-gnome-20cbc903bf677adf3840bc92a139c6fc6fffd954.zip
Fix broken symlink when NOMANCOMPRESS is defined.
Prompted by: PR 129465 for x11-wm/fvwm2
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/fvwm2-devel/Makefile3
-rw-r--r--x11-wm/fvwm2-devel/files/patch-bin::Makefile.in13
-rw-r--r--x11-wm/fvwm2-devel/pkg-plist3
3 files changed, 7 insertions, 12 deletions
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index d1ff464a0f13..02da08dc659f 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -131,7 +131,8 @@ MAN1+= FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
FvwmPerl.1 fvwm-perllib.1 FvwmProxy.1 FvwmTabs.1 FvwmWindowMenu.1 \
FvwmGtkDebug.1
-MLINKS= fvwm.1 fvwm2.1
+MLINKS= fvwm.1 fvwm2.1 \
+ fvwm-root.1 xpmroot.1
.if !defined(WITHOUT_ICONS)
PLIST_SUB+= ICONS=""
diff --git a/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in b/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in
index dde1241a25c4..f39210279d9b 100644
--- a/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in
+++ b/x11-wm/fvwm2-devel/files/patch-bin::Makefile.in
@@ -1,15 +1,12 @@
---- bin/Makefile.in.orig Mon Dec 2 05:08:41 2002
-+++ bin/Makefile.in Tue Dec 17 11:29:50 2002
-@@ -592,9 +592,9 @@
- echo "Minor warning: $(bindir)/xpmroot symlink was not created"
+--- bin/Makefile.in.orig 2008-05-06 22:22:48.000000000 -0700
++++ bin/Makefile.in 2008-12-12 19:35:30.533121271 -0800
+@@ -734,8 +734,7 @@
install-data-local:
-- @rm -f $(DESTDIR)$(mandir)/man1/xpmroot.1
+ @rm -f $(DESTDIR)$(mandir)/man1/xpmroot.1
- @$(LN_S) fvwm-root.1 $(DESTDIR)$(mandir)/man1/xpmroot.1 || \
- echo "Minor warning: $(mandir)/man1/xpmroot.1 symlink was not created"
-+ @rm -f $(DESTDIR)$(mandir)/man1/xpmroot.1.gz
-+ @$(LN_S) fvwm-root.1.gz $(DESTDIR)$(mandir)/man1/xpmroot.1.gz || \
-+ echo "Minor warning: $(mandir)/man1/xpmroot.1.gz symlink was not created"
++
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist
index 730b0b1f69bd..c921fc1ae594 100644
--- a/x11-wm/fvwm2-devel/pkg-plist
+++ b/x11-wm/fvwm2-devel/pkg-plist
@@ -55,9 +55,6 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmTile
libexec/fvwm/%%FVWM_VERSION%%/FvwmWharf
libexec/fvwm/%%FVWM_VERSION%%/FvwmWinList
libexec/fvwm/%%FVWM_VERSION%%/FvwmWindowMenu
-@comment The following are here because they are symlinks
-man/man1/xpmroot.1.gz
-@comment End of symlink list
%%ICONS%%%%DATADIR%%/pixmaps/Jlock.xpm
%%ICONS%%%%DATADIR%%/pixmaps/Jnews.xpm
%%ICONS%%%%DATADIR%%/pixmaps/Jrecycle.xpm