From owner-svn-ports-head@FreeBSD.ORG Sun Dec 29 20:25:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4B6787A9; Sun, 29 Dec 2013 20:25:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 36E4715F5; Sun, 29 Dec 2013 20:25:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBTKPUWo001693; Sun, 29 Dec 2013 20:25:30 GMT (envelope-from johans@svn.freebsd.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBTKPTYt001688; Sun, 29 Dec 2013 20:25:29 GMT (envelope-from johans@svn.freebsd.org) Message-Id: <201312292025.rBTKPTYt001688@svn.freebsd.org> From: Johan van Selst Date: Sun, 29 Dec 2013 20:25:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338040 - in head/mail/emil: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Dec 2013 20:25:30 -0000 Author: johans Date: Sun Dec 29 20:25:29 2013 New Revision: 338040 URL: http://svnweb.freebsd.org/changeset/ports/338040 Log: Enable stage support Modified: head/mail/emil/Makefile head/mail/emil/files/patch-Makefile.in head/mail/emil/pkg-plist Modified: head/mail/emil/Makefile ============================================================================== --- head/mail/emil/Makefile Sun Dec 29 20:23:28 2013 (r338039) +++ head/mail/emil/Makefile Sun Dec 29 20:25:29 2013 (r338040) @@ -17,11 +17,9 @@ COMMENT= Mail format/encoding converter GNU_CONFIGURE= yes CONFIGURE_ENV= YACC=byacc -MAN1= emil.1 emil.cf.1 .if defined(NOPORTDOCS) MAKE_ENV= NOPORTDOCS=${NOPORTDOCS} .endif -NO_STAGE= yes .include Modified: head/mail/emil/files/patch-Makefile.in ============================================================================== --- head/mail/emil/files/patch-Makefile.in Sun Dec 29 20:23:28 2013 (r338039) +++ head/mail/emil/files/patch-Makefile.in Sun Dec 29 20:25:29 2013 (r338040) @@ -1,5 +1,5 @@ --- Makefile.in.orig 1996-06-04 13:54:32.000000000 +0200 -+++ Makefile.in 2011-07-25 20:21:13.000000000 +0200 ++++ Makefile.in 2013-12-29 21:24:36.000000000 +0100 @@ -41,9 +41,10 @@ exec_prefix = @exec_prefix@ #manprefix = @@ -12,16 +12,70 @@ MAINCF = $(libdir)/emil.cf CHARFILE = $(libdir)/charsets.cpl -@@ -262,6 +263,12 @@ install: installdirs - $(INSTALL_DATA) emil.cf.$(manext) $(mandir)/man$(manext); \ +@@ -213,14 +214,14 @@ test: + + install: installdirs + @if test -f emil ; then \ +- if test -f $(bindir)/emil ; then \ ++ if test -f $(DESTDIR)$(bindir)/emil ; then \ + echo " " ;\ + echo "Saving $(bindir)/emil in $(bindir)/emil.bak" ; \ +- mv $(bindir)/emil $(bindir)/emil.bak ; \ ++ mv $(DESTDIR)$(bindir)/emil $(DESTDIR)$(bindir)/emil.bak ; \ + fi ; \ + echo " " ;\ + echo "Installing emil as $(bindir)/emil" ; \ +- $(INSTALL_PROGRAM) emil $(bindir)/emil ; \ ++ $(INSTALL_PROGRAM) emil $(DESTDIR)$(bindir)/emil ; \ + fi ; + @if test -f emil.cf ; then \ + if test -f $(MAINCF) ; then \ +@@ -237,35 +238,41 @@ install: installdirs + else \ + echo " " ;\ + echo "Installing emil.cf as $(MAINCF)" ; \ +- $(INSTALL_DATA) emil.cf $(MAINCF) ; \ ++ $(INSTALL_DATA) emil.cf $(DESTDIR)$(MAINCF) ; \ + fi ; \ + fi ; + @if test -f charset/charsets.cpl ; then \ +- if test -f $(CHARFILE) ; then \ ++ if test -f $(DESTDIR)$(CHARFILE) ; then \ + echo " " ;\ + echo "Keeping $(CHARFILE) as is" ; \ + else \ + echo " " ;\ + echo "Installing charset/charsets.cpl as $(CHARFILE)";\ +- $(INSTALL_DATA) charset/charsets.cpl $(CHARFILE); \ +- chmod 444 $(CHARFILE) ; \ ++ $(INSTALL_DATA) charset/charsets.cpl $(DESTDIR)$(CHARFILE); \ ++ chmod 444 $(DESTDIR)$(CHARFILE) ; \ + fi ; \ + fi ; + @if test -f emil.$(manext) ; then \ + echo " " ;\ + echo "Installing emil.$(manext) in $(mandir)/man$(manext)";\ +- $(INSTALL_DATA) emil.$(manext) $(mandir)/man$(manext); \ ++ $(INSTALL_DATA) emil.$(manext) $(DESTDIR)$(mandir)/man$(manext); \ + fi ; + @if test -f emil.cf.$(manext) ; then \ + echo " " ;\ + echo "Installing emil.cf.$(manext) in $(mandir)/man$(manext)";\ +- $(INSTALL_DATA) emil.cf.$(manext) $(mandir)/man$(manext); \ ++ $(INSTALL_DATA) emil.cf.$(manext) $(DESTDIR)$(mandir)/man$(manext); \ fi ; @echo " " ; +.if !defined(NOPORTDOCS) -+ $(srcdir)/mkinstalldirs $(datadir)/doc/emil ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/doc/emil + @echo "Installing doc files in $(datadir)/doc/emil" ; -+ @$(INSTALL_DATA) $(DOCS) $(datadir)/doc/emil/ ++ @$(INSTALL_DATA) $(DOCS) $(DESTDIR)$(datadir)/doc/emil/ +.endif + @echo " " ; @echo "Installation done." ; installdirs: +- $(srcdir)/mkinstalldirs $(bindir) $(libdir) $(mandir)/man$(manext) ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(mandir)/man$(manext) + + uninstall: + if test -f $(bindir)/emil ; then \ Modified: head/mail/emil/pkg-plist ============================================================================== --- head/mail/emil/pkg-plist Sun Dec 29 20:23:28 2013 (r338039) +++ head/mail/emil/pkg-plist Sun Dec 29 20:25:29 2013 (r338040) @@ -1,6 +1,8 @@ bin/emil lib/charsets.cpl lib/emil.cf +man/man1/emil.1.gz +man/man1/emil.cf.1.gz %%PORTDOCS%%%%DOCSDIR%%/analysis.html %%PORTDOCS%%%%DOCSDIR%%/arguments.html %%PORTDOCS%%%%DOCSDIR%%/arrow_left3.gif