ports/157428: [PATCH] emulators/mtools: respect WITHOUT_X11 in plist

[Jimmy Olgeni]

>Number:         157428
>Category:       ports
>Synopsis:       [PATCH] emulators/mtools: respect WITHOUT_X11 in plist
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 30 13:30:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jimmy Olgeni
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
>Description:
When WITHOUT_X11 is set, floppyd and floppyd_installtest are not
installed. However, the relevant man pages are still installed *but*
not included in the plist, causing tinderbox to complain.

The attached patch passes WITHOUT_X11 to the port's Makefile to set
MAN1 accordingly.

Port maintainer (skreuzer at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- mtools-4.0.10_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/mtools/Makefile,v
retrieving revision 1.69
diff -u -u -r1.69 Makefile
--- Makefile	7 Apr 2009 17:28:52 -0000	1.69
+++ Makefile	30 May 2011 13:22:10 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	mtools
 PORTVERSION=	4.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	mtools
@@ -43,6 +43,7 @@
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--without-x
 PLIST_SUB=	X11="@comment "
+MAKE_ENV+=	WITHOUT_X11=${WITHOUT_X11}
 .else
 USE_XORG=	x11 sm ice xau
 PLIST_SUB=	X11=""
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/emulators/mtools/distinfo,v
retrieving revision 1.26
diff -u -u -r1.26 distinfo
--- distinfo	24 Mar 2009 14:45:55 -0000	1.26
+++ distinfo	30 May 2011 13:22:10 -0000
@@ -1,3 +1,2 @@
-MD5 (mtools-4.0.10.tar.bz2) = 750c2beba968a5d46dbaae24551a82b9
 SHA256 (mtools-4.0.10.tar.bz2) = 860fee13acb39365bd28763070e24011ea55f381f96714d2841937525aa02ded
 SIZE (mtools-4.0.10.tar.bz2) = 381481
Index: files/patch-a
===================================================================
RCS file: /home/pcvs/ports/emulators/mtools/files/patch-a,v
retrieving revision 1.10
diff -u -u -r1.10 patch-a
--- files/patch-a	29 May 2006 10:02:22 -0000	1.10
+++ files/patch-a	30 May 2011 13:22:10 -0000
@@ -1,6 +1,24 @@
---- Makefile.in.orig	Sat May 27 06:56:01 2006
-+++ Makefile.in	Sat May 27 07:07:37 2006
-@@ -116,7 +116,7 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig
++++ Makefile.in
+@@ -72,10 +72,13 @@
+ .SUFFIXES: .o .c
+ .SUFFIXES: .o .c
+ 
+-MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
++MAN1 = mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
+ mclasserase.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1  minfo.1 \
+ mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
+ mrd.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
++ifndef WITHOUT_X11
++MAN1 +=	floppyd.1 floppyd_installtest.1
++endif
+ MAN1EXT	= 1
+ MAN1DIR	= $(DESTDIR)$(mandir)/man${MAN1EXT}
+ MAN5	= mtools.5
+@@ -132,7 +135,7 @@
  xdf_io.c mkmanifest.c
  
  
@@ -9,7 +27,7 @@
  
  LINKS=mattrib mcat mcd mclasserase mcopy mdel mdeltree mdir mdu mformat minfo \
  mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshowfat \
-@@ -257,11 +257,11 @@
+@@ -269,11 +272,11 @@
  install-scripts: $(DESTDIR)$(bindir)/mtools
  	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	@for j in $(SCRIPTS) ; do \
--- mtools-4.0.10_2.patch ends here ---

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