aboutsummaryrefslogtreecommitdiff
path: root/news
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2009-07-05 09:39:18 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2009-07-05 09:39:18 +0000
commit1551d81a4c6ae12150f7cc390dcec7c6aa866d3c (patch)
treeeac90e41fbfd26e86987428ddfc006fb54749f5c /news
parent81b5dde2e9677554f32256f679cb63b01d2ed98c (diff)
downloadports-1551d81a4c6ae12150f7cc390dcec7c6aa866d3c.tar.gz
ports-1551d81a4c6ae12150f7cc390dcec7c6aa866d3c.zip
Notes
Diffstat (limited to 'news')
-rw-r--r--news/fidogate/Makefile15
-rw-r--r--news/fidogate/files/extra-patch-perl11
-rw-r--r--news/fidogate/files/patch-aa21
3 files changed, 22 insertions, 25 deletions
diff --git a/news/fidogate/Makefile b/news/fidogate/Makefile
index b4c4e2131262..06b645f6b694 100644
--- a/news/fidogate/Makefile
+++ b/news/fidogate/Makefile
@@ -25,8 +25,6 @@ MAKE_JOBS_UNSAFE= yes
USE_GMAKE= yes
USE_PERL5= yes
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-perl
-
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 \
@@ -38,16 +36,17 @@ pre-configure:
${TOUCH} ${WRKSRC}/doc/fidogate.info
${RM} -f ${WRKSRC}/doc/fidogate.info-?
${RM} -f ${WRKSRC}/doc/fidogate.txt
- @${PERL5} -pi -e "s=.{PREFIX}=${PREFIX}=g" ${WRKSRC}/config.make
- @${PERL5} -pi -e "s=^CC=#CC=" ${WRKSRC}/config.make
+ @${REINPLACE_CMD} -e "s=.{PREFIX}=${PREFIX}=g" \
+ -e "s=.{LOCALBASE}=${LOCALBASE}=g" \
+ -e "s=^CC=#CC=" ${WRKSRC}/config.make
.if defined(FIDOGATE_RUNAS)
- @${PERL5} -pi -e "s/OWNER.*= news/OWNER = ${FIDOGATE_RUNAS}/" \
+ @${REINPLACE_CMD} -e "s/OWNER.*= news/OWNER = ${FIDOGATE_RUNAS}/" \
${WRKSRC}/config.make
.endif
.if defined(NOPORTDOCS)
- @${PERL5} -pi -e "s/test doc/test/" ${WRKSRC}/Makefile
- @${PERL5} -pi -e "s/run www/run/" ${WRKSRC}/scripts/Makefile
- @${PERL5} -pi -e "s/cp ANNOUNCE/#cp ANNOUNCE/" ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e "s/test doc/test/" \
+ -e "s/cp ANNOUNCE/#cp ANNOUNCE/" \
+ -e "s/run www/run/" ${WRKSRC}/Makefile
.endif
pre-install:
diff --git a/news/fidogate/files/extra-patch-perl b/news/fidogate/files/extra-patch-perl
deleted file mode 100644
index b3780bda825f..000000000000
--- a/news/fidogate/files/extra-patch-perl
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.make.orig Fri Jul 30 23:29:26 1999
-+++ config.make Fri Jul 30 23:30:56 1999
-@@ -141,7 +141,7 @@
-
-
- # The perl interpreter used by subst.pl
--PERL = /usr/bin/perl
-+PERL = /usr/local/bin/perl
-
- # Directories for installing documentation, not used by subst.pl
- INFODIR = /usr/local/share/doc/fidogate/info
diff --git a/news/fidogate/files/patch-aa b/news/fidogate/files/patch-aa
index 20955995eaf8..b4f2858448f4 100644
--- a/news/fidogate/files/patch-aa
+++ b/news/fidogate/files/patch-aa
@@ -1,5 +1,5 @@
---- config.make.orig Tue Apr 11 14:02:25 2000
-+++ config.make Thu Apr 13 06:07:58 2000
+--- 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!!!
@@ -26,10 +26,19 @@
-#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
-@@ -152,9 +152,9 @@
- SENDMAIL_CF_DIR = /usr/lib/sendmail-cf
+ #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