ports/129465: [PATCH] x11-wm/fvwm2 installs broken symbolic links if NOMANCOMPRESS is defined

N.J. Mann njm at njm.me.uk
Sat Dec 6 15:50:03 UTC 2008 

>Number:         129465
>Category:       ports
>Synopsis:       [PATCH] x11-wm/fvwm2 installs broken symbolic links if NOMANCOMPRESS is defined
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 06 15:50:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     N.J. Mann
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD titania.njm.me.uk 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #6: Mon Dec 1 10:07:09 GMT 2008 njm at titania.njm.me.uk:/usr/obj/usr/src/sys/Titania i386


	
>Description:
	When NOMANCOMPRESS is defined in /etc/make.conf the port x11-wm/fvwm2
	installs broken symbolic links for the manual pages fvwm-root(1) and
	fvwm(1), e.g.

	% ls -l fvwm-root.1* fvwm.1*
	lrwxr-xr-x  1 root  wheel  12  6 Dec 09:18 fvwm-root.1.gz@ -> xpmroot.1.gz
	lrwxr-xr-x  1 root  wheel  10  6 Dec 09:18 fvwm.1.gz@ -> fvwm2.1.gz

	where neither xpmroot.1.gz and fvwm2.1.gz exist since the uncompressed
	versions of said files has been installed instead.  The correct links
	when NOMANCOMPRESS is defined are:

	% ls fvwm-root.1* fvwm.1*   
	lrwxr-xr-x  1 root  wheel  9  6 Dec 14:32 fvwm-root.1@ -> xpmroot.1
	lrwxr-xr-x  1 root  wheel  7  6 Dec 14:32 fvwm.1@ -> fvwm2.1

>How-To-Repeat:
	Define NOMANCOMPRESS in /etc/make.conf and install the port.
>Fix:

	The following patch fixes the problem:

--- fvwm2.patch.txt begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/fvwm2/Makefile,v
retrieving revision 1.75
diff -u -r1.75 Makefile
--- Makefile	23 Mar 2008 16:43:55 -0000	1.75
+++ Makefile	6 Dec 2008 14:32:04 -0000
@@ -71,6 +71,8 @@
 	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 \
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11-wm/fvwm2/pkg-plist,v
retrieving revision 1.23
diff -u -r1.23 pkg-plist
--- pkg-plist	12 Sep 2002 14:39:37 -0000	1.23
+++ pkg-plist	6 Dec 2008 14:24:24 -0000
@@ -48,10 +48,6 @@
 libexec/fvwm/%%FVWM_VERSION%%/FvwmTile
 libexec/fvwm/%%FVWM_VERSION%%/FvwmWharf
 libexec/fvwm/%%FVWM_VERSION%%/FvwmWinList
- at comment The following are here because they are symlinks
-man/man1/fvwm.1.gz
-man/man1/fvwm-root.1.gz
- at comment End of symlink list
 share/fvwm2/pixmaps/Jlock.xpm
 share/fvwm2/pixmaps/Jnews.xpm
 share/fvwm2/pixmaps/Jrecycle.xpm
Index: files/patch-fvwm::Makefile.in
===================================================================
RCS file: /home/ncvs/ports/x11-wm/fvwm2/files/patch-fvwm::Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-fvwm::Makefile.in
--- files/patch-fvwm::Makefile.in	9 Sep 2002 14:14:38 -0000	1.2
+++ files/patch-fvwm::Makefile.in	6 Dec 2008 14:19:12 -0000
@@ -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:
Index: files/patch-utils::Makefile.in
===================================================================
RCS file: /home/ncvs/ports/x11-wm/fvwm2/files/patch-utils::Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-utils::Makefile.in
--- files/patch-utils::Makefile.in	9 Sep 2002 14:04:12 -0000	1.1
+++ files/patch-utils::Makefile.in	6 Dec 2008 14:20:01 -0000
@@ -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:
--- fvwm2.patch.txt ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list