From owner-freebsd-perl@FreeBSD.ORG Fri Aug 11 19:05:31 2006 Return-Path: X-Original-To: perl@FreeBSD.org Delivered-To: freebsd-perl@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9CB316A589; Fri, 11 Aug 2006 19:05:31 +0000 (UTC) (envelope-from gslin@netnews.NCTU.edu.tw) Received: from netnews.NCTU.edu.tw (ccreader.nctu.edu.tw [140.113.54.119]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F78C43D46; Fri, 11 Aug 2006 19:05:31 +0000 (GMT) (envelope-from gslin@netnews.NCTU.edu.tw) Received: by netnews.NCTU.edu.tw (Postfix, from userid 1000) id 72D01371; Sat, 12 Aug 2006 03:05:25 +0800 (CST) To: FreeBSD-gnats-submit@freebsd.org From: Gea-Suan Lin X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: <20060811190525.72D01371@netnews.NCTU.edu.tw> Date: Sat, 12 Aug 2006 03:05:25 +0800 (CST) Cc: perl@FreeBSD.org, gslin@gslin.org Subject: [PATCH] ftp/p5-Net-FTPServer: Respect DESTDIR X-BeenThere: freebsd-perl@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: maintainer of a number of perl-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Aug 2006 19:05:31 -0000 >Submitter-Id: current-users >Originator: Gea-Suan Lin >Organization: >Confidential: no >Synopsis: [PATCH] ftp/p5-Net-FTPServer: Respect DESTDIR >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 6.1-RELEASE i386 >Environment: System: FreeBSD netnews.NCTU.edu.tw 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sat May 13 03:43:48 CST 2006 >Description: - Respect DESTDIR - Some modules are in Perl base. Port maintainer (perl@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- p5-Net-FTPServer-1.122.patch begins here --- diff -ruN --exclude=CVS /usr/ports/ftp/p5-Net-FTPServer/Makefile /home/staff/gslin/work/p5-Net-FTPServer/Makefile --- /usr/ports/ftp/p5-Net-FTPServer/Makefile Wed Apr 19 19:03:43 2006 +++ /home/staff/gslin/work/p5-Net-FTPServer/Makefile Sat Aug 12 03:03:32 2006 @@ -21,10 +21,8 @@ ${SITE_PERL}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource \ ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \ ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ ${SITE_PERL}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync \ - ${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \ - ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net + ${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy BUILD_DEPENDS= ${RUN_DEPENDS} MAKE_ENV+= NOCONF=1 @@ -58,16 +56,21 @@ .include .if ${PERL_LEVEL} < 500601 -IGNORE= requires perl 5.6.1 or later. Install lang/perl5 then try again +IGNORE= requires perl 5.6.1 or later. Install lang/perl5.8 then try again +.endif + +.if ${PERL_LEVEL} < 500703 +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ + ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net .endif post-patch: @${REINPLACE_CMD} -e "s/root,root/root,wheel/" \ - -e "s,/usr/sbin,${PREFIX}/sbin," \ + -e "s,/usr/sbin,${TARGETDIR}/sbin," \ ${WRKSRC}/Net-FTPServer.spec.PL @${REINPLACE_CMD} -e "s/-g root/-g wheel/" \ - -e "s,$$.PREFIX./sbin,${PREFIX}/sbin," \ - -e "s,$$.SITEPREFIX./sbin,${PREFIX}/sbin," \ + -e "s,$$.PREFIX./sbin,${TARGETDIR}/sbin," \ + -e "s,$$.SITEPREFIX./sbin,${TARGETDIR}/sbin," \ ${WRKSRC}/Makefile.PL post-install: @@ -77,7 +80,7 @@ @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif - @${PERL} -p -e 's,PREFIX,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE} + @${PERL} -p -e 's,PREFIX,${TARGETDIR},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} .include diff -ruN --exclude=CVS /usr/ports/ftp/p5-Net-FTPServer/pkg-plist /home/staff/gslin/work/p5-Net-FTPServer/pkg-plist --- /usr/ports/ftp/p5-Net-FTPServer/pkg-plist Sun Jan 22 09:55:35 2006 +++ /home/staff/gslin/work/p5-Net-FTPServer/pkg-plist Sat Aug 12 03:03:55 2006 @@ -1,3 +1,4 @@ +@comment $FreeBSD$ %%SITE_PERL%%/Net/FTPServer.pm %%SITE_PERL%%/Net/FTPServer/DBeg1/DirHandle.pm %%SITE_PERL%%/Net/FTPServer/DBeg1/FileHandle.pm --- p5-Net-FTPServer-1.122.patch ends here ---