Date: Mon, 4 Jun 2007 10:33:11 +0200 (CEST) From: Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/113316: mail/metamail : add WITHOUT_X11 option Message-ID: <200706040833.l548XBrB098870@mouton.dockes.com> Resent-Message-ID: <200706040840.l548eBcL021051@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 113316
>Category: ports
>Synopsis: mail/metamail : add WITHOUT_X11 option
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 04 08:40:10 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Jean-Francois Dockes
>Release: FreeBSD 5.5-RELEASE i386
>Organization:
>Environment:
System: FreeBSD mouton 5.5-RELEASE FreeBSD 5.5-RELEASE #2: Fri May 26 07:37:48 CEST 2006 dockes@mouton:/usr/obj/usr/src/sys/MOUTON i386
>Description:
metamail depends on X11 for minor functionality which is quite
probably not even much useful any more, and causes a dependency
on the xorg-apps monster port.
Somebody asked me if the X11 dependency could be made optional.
This patch:
- tries to lighten the dependency list by depending on the
required subports, not the x11-apps metaport
- adds an option to build an x11-less version
The default behaviour is unchanged.
>How-To-Repeat:
>Fix:
diff -ruN metamail.prev/Makefile metamail/Makefile
--- metamail.prev/Makefile Sat May 19 22:14:25 2007
+++ metamail/Makefile Mon Jun 4 09:52:33 2007
@@ -17,11 +17,8 @@
MAINTAINER= jean-francois.dockes@wanadoo.fr
COMMENT= Implementation of MIME, the Multipurpose Internet Mail Extensions
-BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT}
-RUN_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage \
- mkfontdir:${X_CLIENTS_PORT}
+OPTIONS= X11 "X11 hebrew font support" on
-USE_XLIB= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/src
MAN1= audiocompose.1 audiosend.1 extcompose.1 \
getfilename.1 mailto-hebrew.1 mailto.1 metamail.1 \
@@ -31,7 +28,22 @@
showpicture.1 splitmail.1
MAN4= mailcap.4
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_X11)
+BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+RUN_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage \
+ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+USE_XLIB= yes
+PLIST_SUB+= X11=""
+.else
+PLIST_SUB+= X11="@comment "
+.endif
+
post-patch:
+.if defined(WITHOUT_X11)
+ @${REINPLACE_CMD} -e '/fonts/d' ${WRKSRC}/Makefile
+.endif
@${RM} ${WRKSRC}/bin/*.orig
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN metamail.prev/pkg-plist metamail/pkg-plist
--- metamail.prev/pkg-plist Mon Nov 13 11:30:03 2000
+++ metamail/pkg-plist Mon Jun 4 08:34:20 2007
@@ -4,7 +4,7 @@
bin/getfilename
bin/mailserver
bin/mailto
-bin/mailto-hebrew
+%%X11%%bin/mailto-hebrew
bin/metamail
bin/metasend
bin/mimencode
@@ -15,7 +15,7 @@
bin/richtoatk
bin/showaudio
bin/showexternal
-bin/shownonascii
+%%X11%%bin/shownonascii
bin/showpartial
bin/showpicture
bin/sndAppleSingle
@@ -24,11 +24,11 @@
bin/sun-message.csh
bin/sun-to-mime
bin/sun2mime
-lib/metamail/fonts/heb6x13.pcf
-lib/metamail/fonts/heb8x13.pcf
-lib/metamail/fonts/heb8x13B.pcf
-lib/metamail/fonts/fonts.dir
-lib/metamail/fonts/fonts.alias
+%%X11%%lib/metamail/fonts/heb6x13.pcf
+%%X11%%lib/metamail/fonts/heb8x13.pcf
+%%X11%%lib/metamail/fonts/heb8x13B.pcf
+%%X11%%lib/metamail/fonts/fonts.dir
+%%X11%%lib/metamail/fonts/fonts.alias
etc/mailcap
-@dirrm lib/metamail/fonts
-@dirrm lib/metamail
+@dirrmtry lib/metamail/fonts
+@dirrmtry lib/metamail
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706040833.l548XBrB098870>