From owner-svn-ports-all@FreeBSD.ORG  Thu Oct 31 23:35:01 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 ESMTP id 003D6E5B;
 Thu, 31 Oct 2013 23:35:00 +0000 (UTC)
 (envelope-from garga@FreeBSD.org)
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 C802C2BED;
 Thu, 31 Oct 2013 23:35:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9VNZ0XX011313;
 Thu, 31 Oct 2013 23:35:00 GMT (envelope-from garga@svn.freebsd.org)
Received: (from garga@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9VNZ0OH011308;
 Thu, 31 Oct 2013 23:35:00 GMT (envelope-from garga@svn.freebsd.org)
Message-Id: <201310312335.r9VNZ0OH011308@svn.freebsd.org>
From: Renato Botelho <garga@FreeBSD.org>
Date: Thu, 31 Oct 2013 23:35:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332301 - in head/ftp/ftpmirror: . 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Oct 2013 23:35:01 -0000

Author: garga
Date: Thu Oct 31 23:35:00 2013
New Revision: 332301
URL: http://svnweb.freebsd.org/changeset/ports/332301

Log:
  . Support STAGE
  . Simplify Makefile

Modified:
  head/ftp/ftpmirror/Makefile
  head/ftp/ftpmirror/files/patch-Makefile.in   (contents, props changed)

Modified: head/ftp/ftpmirror/Makefile
==============================================================================
--- head/ftp/ftpmirror/Makefile	Thu Oct 31 23:33:45 2013	(r332300)
+++ head/ftp/ftpmirror/Makefile	Thu Oct 31 23:35:00 2013	(r332301)
@@ -23,18 +23,14 @@ CONFIGURE_ENV+=	PERL="${PERL}" INSTALL_P
 
 PORTDOCS=	README.jis RELEASE.jis
 
-NO_STAGE=	yes
 post-configure:
-	@${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/Fan/Fan.pm
-
-.include <bsd.port.pre.mk>
+	@${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|' \
+		${WRKSRC}/Fan/Fan.pm
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/ftp/ftpmirror/files/patch-Makefile.in
==============================================================================
--- head/ftp/ftpmirror/files/patch-Makefile.in	Thu Oct 31 23:33:45 2013	(r332300)
+++ head/ftp/ftpmirror/files/patch-Makefile.in	Thu Oct 31 23:35:00 2013	(r332301)
@@ -1,6 +1,30 @@
---- Makefile.in.orig	Wed Apr 20 08:24:33 2005
-+++ Makefile.in	Wed Apr 20 08:26:40 2005
-@@ -40,10 +40,13 @@
+--- Makefile.in.orig	1997-09-26 11:43:03.000000000 -0300
++++ Makefile.in	2013-10-30 11:19:37.000000000 -0200
+@@ -23,28 +23,31 @@
+ 	rm -f *.old *.bak *.core Makefile
+ 
+ # install:: ${BINDIR}/farm
+-install:: ${BINDIR}/rotate
+-install:: ${BINDIR}/ftpmirror
+-install:: ${SYSCONFDIR}/ftpmirror.cf-sample
++install:: ${DESTDIR}${BINDIR}/rotate
++install:: ${DESTDIR}${BINDIR}/ftpmirror
++install:: ${DESTDIR}${SYSCONFDIR}/ftpmirror.cf-sample
+ 
+-${BINDIR}/rotate: rotate
++${DESTDIR}${BINDIR}/rotate: rotate
+ 	${INSTALL_PROGRAM} $? $@
+ 
+-${BINDIR}/farm: farm
++${DESTDIR}${BINDIR}/farm: farm
+ 	${INSTALL_PROGRAM} $? $@
+ 
+-${BINDIR}/ftpmirror: ftpmirror
++${DESTDIR}${BINDIR}/ftpmirror: ftpmirror
+ 	${INSTALL_PROGRAM} $? $@
+ 
+-${SYSCONFDIR}/ftpmirror.cf-sample: ftpmirror.cf-sample
++${DESTDIR}${SYSCONFDIR}/ftpmirror.cf-sample: ftpmirror.cf-sample
  	${INSTALL_DATA} $? $@
  
  # for subdirectories...
@@ -9,9 +33,10 @@
  	@ for d in ${SUBDIR} ; do \
  		( echo "make $@ in $$d..." && cd $$d && make $@ ) ; \
  	done
-+
+ 
 +install:: Fan/Makefile
 +	( echo "make pure_install in Fan..." && cd Fan && make pure_install ) ; \
- 
++
  # Fan subdirectory requres Makefile first.
  Fan/Makefile:: Fan/Makefile.PL
+ 	cd Fan; ${PERL} Makefile.PL