diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2008-12-13 06:26:29 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2008-12-13 06:26:29 +0000 |
| commit | 5b7c6b6b6b4e379d99ad49ac46dc91a6f38fc5e6 (patch) | |
| tree | a55f6dbb7433f17fd0af68f69eeefeb2040670d7 /x11-wm/fvwm2 | |
| parent | - fix include for gcc43 (diff) | |
Fix broken symlink when NOMANCOMPRESS is defined.
PR: 129465
Submitted by: "N.J. Mann" <njm@njm.me.uk>
Notes
Notes:
svn path=/head/; revision=224176
Diffstat (limited to 'x11-wm/fvwm2')
| -rw-r--r-- | x11-wm/fvwm2/Makefile | 3 | ||||
| -rw-r--r-- | x11-wm/fvwm2/files/patch-fvwm::Makefile.in | 15 | ||||
| -rw-r--r-- | x11-wm/fvwm2/files/patch-utils::Makefile.in | 17 | ||||
| -rw-r--r-- | x11-wm/fvwm2/pkg-plist | 4 |
4 files changed, 17 insertions, 22 deletions
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index cc2dd81e5ba3..0cedb2b9228c 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -71,6 +71,9 @@ MAN1= FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \ fvwm2.1 fvwm24_convert.1 fvwmbug.1 fvwmrc_convert.1 xpmroot.1 \ fvwm-config.1 +MLINKS= fvwm2.1 fvwm.1 \ + xpmroot.1 fvwm-root.1 + .if ${HAVE_GNOME:Mimlib}!="" USE_GNOME= imlib CONFIGURE_ARGS+= --with-gnome --enable-gnome-hints \ diff --git a/x11-wm/fvwm2/files/patch-fvwm::Makefile.in b/x11-wm/fvwm2/files/patch-fvwm::Makefile.in index 0928c9397003..ea1216bfefa5 100644 --- a/x11-wm/fvwm2/files/patch-fvwm::Makefile.in +++ b/x11-wm/fvwm2/files/patch-fvwm::Makefile.in @@ -1,15 +1,12 @@ ---- fvwm/Makefile.in.orig Sun Aug 11 08:10:41 2002 -+++ fvwm/Makefile.in Mon Sep 9 06:47:19 2002 -@@ -654,8 +654,8 @@ - echo "Warning: $(bindir)/fvwm symlink was not created" +--- fvwm/Makefile.in.orig 2006-12-09 12:11:00.000000000 +0000 ++++ fvwm/Makefile.in 2008-12-06 14:17:03.000000000 +0000 +@@ -619,8 +619,7 @@ install-data-local: -- @$(NEW_NAME_SYMLINKS) rm -f $(DESTDIR)$(mandir)/man1/fvwm.1 || true + @$(NEW_NAME_SYMLINKS) rm -f $(DESTDIR)$(mandir)/man1/fvwm.1 || true - @$(NEW_NAME_SYMLINKS) $(LN_S) fvwm2.1 $(DESTDIR)$(mandir)/man1/fvwm.1 || \ -+ @$(NEW_NAME_SYMLINKS) rm -f $(DESTDIR)$(mandir)/man1/fvwm.1.gz || true -+ @$(NEW_NAME_SYMLINKS) $(LN_S) fvwm2.1.gz $(DESTDIR)$(mandir)/man1/fvwm.1.gz || \ - echo "Warning: $(mandir)/man1/fvwm.1 symlink was not created" -+ echo "Warning: $(mandir)/man1/fvwm.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/files/patch-utils::Makefile.in b/x11-wm/fvwm2/files/patch-utils::Makefile.in index 2db2962389e3..bbe2aaeeb103 100644 --- a/x11-wm/fvwm2/files/patch-utils::Makefile.in +++ b/x11-wm/fvwm2/files/patch-utils::Makefile.in @@ -1,13 +1,12 @@ ---- utils/Makefile.in.orig Sun Aug 11 08:10:50 2002 -+++ utils/Makefile.in Mon Sep 9 06:46:39 2002 -@@ -478,8 +478,8 @@ - echo "Warning: $(bindir)/fvwm-root symlink was not created" +--- utils/Makefile.in.orig 2006-12-09 12:11:12.000000000 +0000 ++++ utils/Makefile.in 2008-12-06 14:17:41.000000000 +0000 +@@ -623,8 +623,7 @@ install-data-local: -- @$(NEW_NAME_SYMLINKS) rm -f $(DESTDIR)$(mandir)/man1/fvwm-root.1 || true + @$(NEW_NAME_SYMLINKS) rm -f $(DESTDIR)$(mandir)/man1/fvwm-root.1 || true - @$(NEW_NAME_SYMLINKS) $(LN_S) xpmroot.1 $(DESTDIR)$(mandir)/man1/fvwm-root.1 || \ -+ @$(NEW_NAME_SYMLINKS) rm -f $(DESTDIR)$(mandir)/man1/fvwm-root.1.gz || true -+ @$(NEW_NAME_SYMLINKS) $(LN_S) xpmroot.1.gz $(DESTDIR)$(mandir)/man1/fvwm-root.1.gz || \ - echo "Warning: $(mandir)/man1/fvwm-root.1 symlink was not created" - +- echo "Warning: $(mandir)/man1/fvwm-root.1 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/pkg-plist b/x11-wm/fvwm2/pkg-plist index ecf16ab08392..be342e0368f1 100644 --- a/x11-wm/fvwm2/pkg-plist +++ b/x11-wm/fvwm2/pkg-plist @@ -48,10 +48,6 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmTheme libexec/fvwm/%%FVWM_VERSION%%/FvwmTile libexec/fvwm/%%FVWM_VERSION%%/FvwmWharf libexec/fvwm/%%FVWM_VERSION%%/FvwmWinList -@comment The following are here because they are symlinks -man/man1/fvwm.1.gz -man/man1/fvwm-root.1.gz -@comment End of symlink list share/fvwm2/pixmaps/Jlock.xpm share/fvwm2/pixmaps/Jnews.xpm share/fvwm2/pixmaps/Jrecycle.xpm |