Date: Sat, 16 Nov 2013 20:07:54 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334027 - in head/news/fidogate: . files Message-ID: <201311162007.rAGK7sHv050429@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Sat Nov 16 20:07:54 2013 New Revision: 334027 URL: http://svnweb.freebsd.org/changeset/ports/334027 Log: - use STAGEDIR - rename patchfiles Added: head/news/fidogate/files/patch-Makefile - copied unchanged from r333522, head/news/fidogate/files/patch-ac head/news/fidogate/files/patch-config.make - copied unchanged from r333522, head/news/fidogate/files/patch-aa Deleted: head/news/fidogate/files/patch-aa head/news/fidogate/files/patch-ac Modified: head/news/fidogate/Makefile Modified: head/news/fidogate/Makefile ============================================================================== --- head/news/fidogate/Makefile Sat Nov 16 19:39:55 2013 (r334026) +++ head/news/fidogate/Makefile Sat Nov 16 20:07:54 2013 (r334027) @@ -9,55 +9,64 @@ MASTER_SITES= SF \ MAINTAINER= dinoex@FreeBSD.org COMMENT= Fido-Internet Gateway and Tosser -.if !defined(WITHOUT_IFCICO) -RUN_DEPENDS= ${LOCALBASE}/libexec/ifmail/ifcico:${PORTSDIR}/news/ifmail -.endif - MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes +NEED_ROOT= yes USES= gmake perl5 +FIXDEST= . doc doc/gatebau doc/html scripts/areas \ + scripts/maintenance scripts/misc scripts/nodelist \ + scripts/outbound scripts/run scripts/www src/areafix \ + src/charset src/ffx src/gate src/tick src/toss src/util DOCLIST= fidogate.texi fidogate.txt gatebau94.txt kludge-rfc.doc \ msgid.doc qmail.txt texinfo.tex dirs.html index.html \ template.html fido howto misc rfc gatebau/msgid.sgml \ gatebau/msgid.tex gatebau/msgid.txt -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> + +post-patch: + ${REINPLACE_CMD} -e 's| .(PREFIX)| $$(DESTDIR)$$(PREFIX)|g' \ + ${FIXDEST:S,$,/Makefile,S,^,${WRKSRC}/,} pre-configure: ${TOUCH} ${WRKSRC}/doc/fidogate.info ${RM} -f ${WRKSRC}/doc/fidogate.info-? ${RM} -f ${WRKSRC}/doc/fidogate.txt - @${REINPLACE_CMD} -e "s|.{PREFIX}|${PREFIX}|g" \ + ${REINPLACE_CMD} -e "s|[.]info-|.info|" ${WRKSRC}/doc/Makefile + ${REINPLACE_CMD} -e "s|.{PREFIX}|${PREFIX}|g" \ -e "s|.{LOCALBASE}|${LOCALBASE}|g" \ -e "s|^CC|#CC|" ${WRKSRC}/config.make .if defined(FIDOGATE_RUNAS) - @${REINPLACE_CMD} -e "s|OWNER.*= news|OWNER = ${FIDOGATE_RUNAS}|" \ + ${REINPLACE_CMD} -e "s|OWNER.*= news|OWNER = ${FIDOGATE_RUNAS}|" \ ${WRKSRC}/config.make .endif -.if defined(NOPORTDOCS) - @${REINPLACE_CMD} -e "s|test doc|test|" \ +.if !${PORT_OPTIONS:MDOCS} + ${REINPLACE_CMD} -e "s|test doc|test|" \ -e "s|cp ANNOUNCE|#cp ANNOUNCE|" \ ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e "s|run www|run|" ${WRKSRC}/scripts/Makefile + ${REINPLACE_CMD} -e "s|run www|run|" ${WRKSRC}/scripts/Makefile .endif pre-install: - ${MKDIR} ${PREFIX}/libexec/fidogate -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR}/html ${DOCSDIR}/info ${DOCSDIR}/fido \ - ${DOCSDIR}/howto ${DOCSDIR}/misc ${DOCSDIR}/gatebau + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/fidogate +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/html \ + ${STAGEDIR}${DOCSDIR}/info \ + ${STAGEDIR}${DOCSDIR}/fido \ + ${STAGEDIR}${DOCSDIR}/howto \ + ${STAGEDIR}${DOCSDIR}/misc \ + ${STAGEDIR}${DOCSDIR}/gatebau .endif post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - @${TAR} -C ${WRKSRC}/doc -cf - ${DOCLIST} | ${TAR} -C ${DOCSDIR} -xf - +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${TAR} -C ${WRKSRC}/doc -cf - ${DOCLIST} | ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf - .endif -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR} - @${TAR} -C ${WRKSRC}/examples -cf - . | ${TAR} -C ${EXAMPLESDIR} -xf - +.if ${PORT_OPTIONS:MEXAMPLES} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${TAR} -C ${WRKSRC}/examples -cf - . | ${TAR} -C ${STAGEDIR}${EXAMPLESDIR} -xf - .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Copied: head/news/fidogate/files/patch-Makefile (from r333522, head/news/fidogate/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/news/fidogate/files/patch-Makefile Sat Nov 16 20:07:54 2013 (r334027, copy of r333522, head/news/fidogate/files/patch-ac) @@ -0,0 +1,11 @@ +--- Makefile.orig Sun Oct 17 13:49:26 1999 ++++ Makefile Fri Jan 21 18:04:46 2000 +@@ -9,7 +9,7 @@ + include $(TOPDIR)/config.make + include $(TOPDIR)/rules.make + +-SUBDIRS = src scripts test doc sendmail ++SUBDIRS = src scripts test doc + + INSTALLDIRS = $(DEFAULT_V_CONFIGDIR) \ + $(DEFAULT_V_LIBDIR) \ Copied: head/news/fidogate/files/patch-config.make (from r333522, head/news/fidogate/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/news/fidogate/files/patch-config.make Sat Nov 16 20:07:54 2013 (r334027, copy of r333522, head/news/fidogate/files/patch-aa) @@ -0,0 +1,52 @@ +--- config.make.orig 2003-04-15 20:45:20.000000000 +0200 ++++ config.make 2009-07-05 06:31:34.000000000 +0200 +@@ -57,13 +57,13 @@ + + # variable parameters, can be changed at run-time, DO NOT DELETE ANYTHING!!! + DEFAULT_V_CONFIGDIR = /etc/fidogate +-DEFAULT_V_LIBDIR = /usr/lib/fidogate +-DEFAULT_V_BINDIR = $(DEFAULT_V_LIBDIR)/bin +-DEFAULT_V_LOGDIR = /var/log/fidogate ++DEFAULT_V_LIBDIR = ${PREFIX}/libexec/fidogate ++DEFAULT_V_BINDIR = ${PREFIX}/libexec/fidogate ++DEFAULT_V_LOGDIR = /var/spool/fidogate/log + DEFAULT_V_VARDIR = /var/lib/fidogate +-DEFAULT_V_LOCKDIR = /var/lock/fidogate ++DEFAULT_V_LOCKDIR = /var/spool/fidogate/lock + DEFAULT_V_SPOOLDIR = /var/spool/fidogate +-DEFAULT_V_BTBASEDIR = /var/spool/bt ++DEFAULT_V_BTBASEDIR = /var/spool/fidogate/bt + DEFAULT_V_INBOUND = $(DEFAULT_V_BTBASEDIR)/in + DEFAULT_V_PINBOUND = $(DEFAULT_V_BTBASEDIR)/pin + DEFAULT_V_UUINBOUND = $(DEFAULT_V_BTBASEDIR)/uuin +@@ -87,7 +87,7 @@ + DEFAULT_F_NEWSVARDIR = /var/lib/news + # INN 1.7 + #DEFAULT_F_NEWSLIBDIR = /usr/lib/news +-#DEFAULT_F_NEWSSPOOLDIR = /var/spool/news ++#DEFAULT_F_NEWSSPOOLDIR = /var/spool/news/articles + # INN 2.2 + #DEFAULT_F_NEWSLIBDIR = /usr/lib + #DEFAULT_F_NEWSSPOOLDIR = /var/spool/news/articles +@@ -149,7 +149,7 @@ + + + # The perl interpreter used by subst.pl +-PERL = /usr/bin/perl ++PERL = ${LOCALBASE}/bin/perl + + # Directory with sendmail m4 configuration files + # RedHat 6.x +@@ -158,9 +158,9 @@ + SENDMAIL_CF_DIR = /usr/share/sendmail-cf + + # Directories for installing documentation, not used by subst.pl +-INFODIR = /usr/info +-HTMLDIR = /html/fidogate +-HTMLLOGDIR = /html/log ++INFODIR = ${PREFIX}/share/doc/fidogate/info ++HTMLDIR = ${PREFIX}/share/doc/fidogate/html ++HTMLLOGDIR = ${PREFIX}/share/doc/fidogate/html + + # RedHat RPM related dirs + RPMBASEDIR = /usr/src/redhat
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311162007.rAGK7sHv050429>