Date: Wed, 4 Jun 2014 11:16:58 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356467 - in head/mail/metamail: . files Message-ID: <201406041116.s54BGw9n041468@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Wed Jun 4 11:16:58 2014 New Revision: 356467 URL: http://svnweb.freebsd.org/changeset/ports/356467 QAT: https://qat.redports.org/buildarchive/r356467/ Log: - Add staging support - Use options helpers, subs Modified: head/mail/metamail/Makefile head/mail/metamail/files/patch-Makefile head/mail/metamail/pkg-plist Modified: head/mail/metamail/Makefile ============================================================================== --- head/mail/metamail/Makefile Wed Jun 4 11:15:04 2014 (r356466) +++ head/mail/metamail/Makefile Wed Jun 4 11:16:58 2014 (r356467) @@ -15,34 +15,21 @@ COMMENT= Implementation of MIME, the Mul LICENSE= MIT +WRKSRC= ${WRKDIR}/${DISTNAME}/src + OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 -X11_DESC= X11 hebrew font support - -WRKSRC= ${WRKDIR}/${DISTNAME}/src +OPTIONS_SUB= yes -MAN1= audiocompose.1 audiosend.1 extcompose.1 \ - getfilename.1 mailto-hebrew.1 mailto.1 metamail.1 \ - metasend.1 mime.1 mimencode.1 mmencode.1 \ - patch-metamail.1 richtext.1 showaudio.1 \ - showexternal.1 shownonascii.1 showpartial.1 \ - showpicture.1 splitmail.1 -MAN4= mailcap.4 +X11_DESC= X11 hebrew font support +X11_BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +X11_RUN_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir +X11_USE= XORG=x11 -NO_STAGE= yes .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MX11} -BUILD_DEPENDS+= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ - mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -RUN_DEPENDS+= xloadimage:${PORTSDIR}/x11/xloadimage \ - mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir -USE_XORG= x11 -PLIST_SUB+= X11="" -.else -PLIST_SUB+= X11="@comment " -.endif - post-patch: .if ! ${PORT_OPTIONS:MX11} @${REINPLACE_CMD} -e '/fonts/d' ${WRKSRC}/Makefile Modified: head/mail/metamail/files/patch-Makefile ============================================================================== --- head/mail/metamail/files/patch-Makefile Wed Jun 4 11:15:04 2014 (r356466) +++ head/mail/metamail/files/patch-Makefile Wed Jun 4 11:16:58 2014 (r356467) @@ -1,5 +1,5 @@ --- Makefile.orig 1994-01-26 18:32:33.000000000 +0100 -+++ Makefile 2013-05-27 11:38:13.565381504 +0200 ++++ Makefile 2014-06-04 12:42:07.532697759 +0200 @@ -26,7 +26,7 @@ CP = cp @@ -64,16 +64,37 @@ -${RM} bin/shownonascii (cd bin; ${LN} ../fonts/shownonascii shownonascii) -${RM} bin/mailto-hebrew -@@ -145,10 +145,11 @@ +@@ -127,28 +127,27 @@ + @(cd bin; \ + for file in *; \ + do \ +- target=$(LOCALBINDIR)/$$file; \ ++ target=$(DESTDIR)$(LOCALBINDIR)/$$file; \ + echo "installing binary $$target"; \ + ${INSTALL} $$file $$target; \ + done) + @(cd man; \ + for file in *.1; \ + do \ +- target=$(MAN1DIR)/`basename $$file .1`.$(MAN1EXT); \ ++ target=$(DESTDIR)$(MAN1DIR)/`basename $$file .1`.$(MAN1EXT); \ + echo "installing man page $$target";\ + ${CP} $$file $$target; \ + done) + @(cd man; \ + for file in *.4; \ + do \ +- target=$(MAN4DIR)/`basename $$file .4`.$(MAN4EXT); \ ++ target=$(DESTDIR)$(MAN4DIR)/`basename $$file .4`.$(MAN4EXT); \ echo "installing man page $$target";\ ${CP} $$file $$target; \ done) - @echo "Renaming old mailcap file to $(MAILCAPDIR)/mailcap.old -+ @echo "Renaming old mailcap file to $(MAILCAPDIR)/mailcap.old" - -mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old +- -mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old @echo "installing file $(MAILCAPDIR)/mailcap" - ${CP} mailcap $(MAILCAPDIR) -+ (cd fonts ; $(MAKE) PREFIX=${PREFIX} CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}" install) +- ${CP} mailcap $(MAILCAPDIR) ++ ${CP} mailcap $(DESTDIR)$(MAILCAPDIR) ++ (cd fonts ; $(MAKE) PREFIX=${DESTDIR}${PREFIX} CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}" install) uninstall-all: @(cd bin; \ Modified: head/mail/metamail/pkg-plist ============================================================================== --- head/mail/metamail/pkg-plist Wed Jun 4 11:15:04 2014 (r356466) +++ head/mail/metamail/pkg-plist Wed Jun 4 11:16:58 2014 (r356467) @@ -30,5 +30,25 @@ bin/sun2mime %%X11%%lib/metamail/fonts/fonts.dir %%X11%%lib/metamail/fonts/fonts.alias etc/mailcap +man/man1/audiocompose.1.gz +man/man1/audiosend.1.gz +man/man1/extcompose.1.gz +man/man1/getfilename.1.gz +man/man1/mailto-hebrew.1.gz +man/man1/mailto.1.gz +man/man1/metamail.1.gz +man/man1/metasend.1.gz +man/man1/mime.1.gz +man/man1/mimencode.1.gz +man/man1/mmencode.1.gz +man/man1/patch-metamail.1.gz +man/man1/richtext.1.gz +man/man1/showaudio.1.gz +man/man1/showexternal.1.gz +man/man1/shownonascii.1.gz +man/man1/showpartial.1.gz +man/man1/showpicture.1.gz +man/man1/splitmail.1.gz +man/man4/mailcap.4.gz @dirrmtry lib/metamail/fonts @dirrmtry lib/metamail
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406041116.s54BGw9n041468>