Date: Mon, 1 Jan 2018 09:09:52 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457758 - in head/mail/metamail: . files Message-ID: <201801010909.w0199qwt044688@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Mon Jan 1 09:09:51 2018 New Revision: 457758 URL: https://svnweb.freebsd.org/changeset/ports/457758 Log: mail/metamail: fix build with X11 option enabled - It has been broken for more than one year. r412348 was the last buildable version PR: 224794 Submitted by: Ting-Wei Lan <lantw44@gmail.com> Added: head/mail/metamail/files/extra-patch-Makefile-nox11 - copied unchanged from r457757, head/mail/metamail/files/patch-Makefile head/mail/metamail/files/extra-patch-Makefile-x11 - copied, changed from r457755, head/mail/metamail/files/patch-Makefile Deleted: head/mail/metamail/files/patch-Makefile Modified: head/mail/metamail/Makefile Modified: head/mail/metamail/Makefile ============================================================================== --- head/mail/metamail/Makefile Mon Jan 1 09:05:38 2018 (r457757) +++ head/mail/metamail/Makefile Mon Jan 1 09:09:51 2018 (r457758) @@ -3,7 +3,7 @@ PORTNAME= metamail PORTVERSION= 2.7 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= mail MASTER_SITES= http://ftp.funet.fi/pub/unix/mail/metamail/ \ ftp://ftp.research.telcordia.com/pub/nsb/ @@ -28,6 +28,8 @@ X11_BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \ X11_RUN_DEPENDS= xloadimage:x11/xloadimage \ mkfontdir:x11-fonts/mkfontdir X11_USE= XORG=x11 +X11_EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile-x11 +X11_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile-nox11 post-patch-X11-off: @${REINPLACE_CMD} -e '/fonts/d' ${WRKSRC}/Makefile Copied: head/mail/metamail/files/extra-patch-Makefile-nox11 (from r457757, head/mail/metamail/files/patch-Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/metamail/files/extra-patch-Makefile-nox11 Mon Jan 1 09:09:51 2018 (r457758, copy of r457757, head/mail/metamail/files/patch-Makefile) @@ -0,0 +1,108 @@ +--- Makefile.orig 1994-01-26 17:32:33 UTC ++++ Makefile +@@ -26,7 +26,7 @@ MAKE = make + CP = cp + + # How to compile C programs +-CC = cc ++#CC = cc + + # You may also want to change the CFLAGS variable, which will be passed on + # to all subdirectories. If you do that, the changes will only work right if you +@@ -38,7 +38,7 @@ FOOBAR-sun4=-Bstatic + + STATICFLAG=FOOBAR${HOST_ARCH} + +-CFLAGS = -g -I. ${$(STATICFLAG)} ++CFLAGS += -I. ${$(STATICFLAG)} + # The following is better if you want to make sure you run with SYSV defined + # CFLAGS = -g -I. ${$(STATICFLAG)} -DSYSV + # Also, for SGI Irix, compile in K&R mode +@@ -49,9 +49,9 @@ CFLAGS = -g -I. ${$(STATICFLAG)} + # LDLIBS variable. + # + # For Sun and BSD systems, the following should work... +-LDLIBS = ++# LDLIBS = + # On BSD 4.4 systems, you will need the following +-# LDLIBS = -lcompat ++LDLIBS = -s -lcompat + # On SGI machines, we need -lsun for getpw...(), and -lc_s saves some space. + # LDLIBS = -lsun -lc_s + # ISC SysVr3.2.2 has a shared C library and requires libinet.a to resolve +@@ -72,10 +72,10 @@ CONFIGDIR = . + # install -s -c $(LOCALBINDIR) $$file + # + #INSTALL = cp +-INSTALL = install -c -s ++INSTALL = install -c + + # Root of installation tree +-INSTROOT = /usr/local ++INSTROOT = ${PREFIX} + # + # This is where binaries should be copied + LOCALBINDIR = ${INSTROOT}/bin +@@ -96,9 +96,9 @@ MAILCAPDIR = ${INSTROOT}/etc + # This helps with the "for" constructs below on some platforms: + SHELL=/bin/sh + +-install: basics ++install: install-all + +-basics:: ++all basics:: + (cd metamail ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}") + -${RM} bin/metamail + (cd bin; ${LN} ../metamail/metamail metamail) +@@ -117,38 +117,33 @@ basics:: + (cd bin; ${LN} ../richmail/richtext richtext) + -${RM} bin/richtoatk + (cd bin; ${LN} ../richmail/richtoatk richtoatk) +- (cd fonts ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}") + -${RM} bin/shownonascii +- (cd bin; ${LN} ../fonts/shownonascii shownonascii) + -${RM} bin/mailto-hebrew +- (cd bin; ${LN} ../fonts/mailto-hebrew mailto-hebrew) + + install-all: basics + @(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 +- -mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old + @echo "installing file $(MAILCAPDIR)/mailcap" +- ${CP} mailcap $(MAILCAPDIR) ++ ${CP} mailcap $(DESTDIR)$(MAILCAPDIR) + + uninstall-all: + @(cd bin; \ +@@ -179,7 +174,6 @@ clean: + -${RM} -rf *.BAK + (cd metamail ; $(MAKE) clean) + (cd richmail ; $(MAKE) clean) +- (cd fonts ; $(MAKE) FONTSUFFIX="${FONTSUFFIX}" clean) + + cleanbin: + -${RM} bin/metamail Copied and modified: head/mail/metamail/files/extra-patch-Makefile-x11 (from r457755, head/mail/metamail/files/patch-Makefile) ============================================================================== --- head/mail/metamail/files/patch-Makefile Mon Jan 1 08:40:22 2018 (r457755, copy source) +++ head/mail/metamail/files/extra-patch-Makefile-x11 Mon Jan 1 09:09:51 2018 (r457758) @@ -55,17 +55,18 @@ (cd metamail ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}") -${RM} bin/metamail (cd bin; ${LN} ../metamail/metamail metamail) -@@ -117,38 +117,33 @@ basics:: +@@ -115,9 +115,9 @@ basics:: + (cd richmail ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}") + -${RM} bin/richtext (cd bin; ${LN} ../richmail/richtext richtext) ++ (cd fonts ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}") -${RM} bin/richtoatk (cd bin; ${LN} ../richmail/richtoatk richtoatk) - (cd fonts ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}") -${RM} bin/shownonascii -- (cd bin; ${LN} ../fonts/shownonascii shownonascii) + (cd bin; ${LN} ../fonts/shownonascii shownonascii) -${RM} bin/mailto-hebrew -- (cd bin; ${LN} ../fonts/mailto-hebrew mailto-hebrew) - - install-all: basics +@@ -127,28 +127,27 @@ install-all: basics @(cd bin; \ for file in *; \ do \ @@ -95,10 +96,11 @@ @echo "installing file $(MAILCAPDIR)/mailcap" - ${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; \ -@@ -179,7 +174,6 @@ clean: +@@ -179,7 +178,6 @@ clean: -${RM} -rf *.BAK (cd metamail ; $(MAKE) clean) (cd richmail ; $(MAKE) clean)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801010909.w0199qwt044688>