Date: Sun, 9 Nov 2003 16:30:01 +0100 (CET) From: Lars Thegler <lars@thegler.dk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: petef@FreeBSD.org Subject: ports/59083: [PATCH] ftp/p5-Net-FTPServer: Fix for perl > 5.6, r/o PKGDIR Message-ID: <20031109153001.A9C0E3EB3@dask.thegler.dk> Resent-Message-ID: <200311091540.hA9FeAnS073848@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59083 >Category: ports >Synopsis: [PATCH] ftp/p5-Net-FTPServer: Fix for perl > 5.6, r/o PKGDIR >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Nov 09 07:40:09 PST 2003 >Closed-Date: >Last-Modified: >Originator: Lars Thegler >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: System: FreeBSD dask.thegler.dk 4.9-STABLE FreeBSD 4.9-STABLE #2: Wed Nov 5 11:25:36 CET 2003 >Description: - p5-IO is IGNORE for perl > 5.6, so make dependency conditional - fix for read-only PKGDIR - use EXAMPLESDIR and DOCSDIR to keep portlint happy Port maintainer (petef@FreeBSD.org) is cc'd. >How-To-Repeat: >Fix: --- p5-Net-FTPServer.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/ftp/p5-Net-FTPServer/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 27 Oct 2003 02:28:59 -0000 1.17 +++ Makefile 4 Nov 2003 21:44:54 -0000 @@ -8,6 +8,7 @@ PORTNAME= Net-FTPServer PORTVERSION= 1.118 +PORTREVISION= 1 CATEGORIES= ftp perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Net @@ -20,7 +21,6 @@ ${SITE_PERL}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource \ ${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}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO \ ${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \ ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \ ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib @@ -30,6 +30,8 @@ MAKE_ENV+= NOCONF=1 PERL_CONFIGURE= yes +PKGMESSAGE= ${WRKDIR}/pkg-message + MAN3= Net::FTPServer.3 \ Net::FTPServer::DBeg1::DirHandle.3 \ Net::FTPServer::DBeg1::FileHandle.3 \ @@ -48,6 +50,8 @@ Net::FTPServer::RO::FileHandle.3 \ Net::FTPServer::RO::Server.3 +DOCS= FAQ README TODO doc/* + post-patch: @${REINPLACE_CMD} -e "s/root,root/root,wheel/" \ -e "s,/usr/sbin,${PREFIX}/sbin," \ @@ -57,16 +61,13 @@ ${WRKSRC}/Makefile.PL post-install: - @${MKDIR} ${PREFIX}/share/examples/Net-FTPServer - ${INSTALL_DATA} ${WRKSRC}/ftpd.conf \ - ${PREFIX}/share/examples/Net-FTPServer + @${MKDIR} ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/ftpd.conf ${EXAMPLESDIR} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for file in FAQ README TODO doc/* - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif - @${PERL} -pi -e 's,PREFIX,${PREFIX},g' ${PKGMESSAGE} + @${PERL} -p -e 's,PREFIX,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} .include <bsd.port.pre.mk> @@ -74,6 +75,8 @@ .if ${PERL_LEVEL} < 500600 BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137 RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137 +BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO .else BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/ftp/p5-Net-FTPServer/pkg-plist,v retrieving revision 1.8 diff -u -r1.8 pkg-plist --- pkg-plist 27 Oct 2003 02:28:59 -0000 1.8 +++ pkg-plist 4 Nov 2003 21:44:54 -0000 @@ -20,26 +20,26 @@ sbin/ftpd.pl sbin/inmem-ftpd.pl sbin/ro-ftpd.pl -%%PORTDOCS%%share/doc/Net-FTPServer/FAQ -%%PORTDOCS%%share/doc/Net-FTPServer/README -%%PORTDOCS%%share/doc/Net-FTPServer/TODO -%%PORTDOCS%%share/doc/Net-FTPServer/archives.txt -%%PORTDOCS%%share/doc/Net-FTPServer/eg1-psql63.sql -%%PORTDOCS%%share/doc/Net-FTPServer/eg1.sql -%%PORTDOCS%%share/doc/Net-FTPServer/modules.txt -%%PORTDOCS%%share/doc/Net-FTPServer/press1.0.txt -%%PORTDOCS%%share/doc/Net-FTPServer/rfcs.txt -%%PORTDOCS%%share/doc/Net-FTPServer/roadmap-1.2.txt -%%PORTDOCS%%share/doc/Net-FTPServer/safesignals.txt -%%PORTDOCS%%share/doc/Net-FTPServer/sharedstate.txt -share/examples/Net-FTPServer/ftpd.conf -@dirrm share/examples/Net-FTPServer -%%PORTDOCS%%@dirrm share/doc/Net-FTPServer +%%PORTDOCS%%%%DOCSDIR%%/FAQ +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/archives.txt +%%PORTDOCS%%%%DOCSDIR%%/eg1-psql63.sql +%%PORTDOCS%%%%DOCSDIR%%/eg1.sql +%%PORTDOCS%%%%DOCSDIR%%/modules.txt +%%PORTDOCS%%%%DOCSDIR%%/press1.0.txt +%%PORTDOCS%%%%DOCSDIR%%/rfcs.txt +%%PORTDOCS%%%%DOCSDIR%%/roadmap-1.2.txt +%%PORTDOCS%%%%DOCSDIR%%/safesignals.txt +%%PORTDOCS%%%%DOCSDIR%%/sharedstate.txt +%%PORTDOCS%%%%EXAMPLESDIR%%/ftpd.conf +%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPServer -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null +@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true @dirrm %%SITE_PERL%%/Net/FTPServer/RO @dirrm %%SITE_PERL%%/Net/FTPServer/InMem @dirrm %%SITE_PERL%%/Net/FTPServer/Full @dirrm %%SITE_PERL%%/Net/FTPServer/DBeg1 @dirrm %%SITE_PERL%%/Net/FTPServer -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null +@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true --- p5-Net-FTPServer.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031109153001.A9C0E3EB3>