5 files changed, 19 insertions, 50 deletions

diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index 45e55efc63cc..1fe58eca9304 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -41,12 +41,13 @@ MYSUBDIR?=
 QMPREFIX?=	${PREFIX}/${MYSUBDIR}
 
 NO_MTREE=	yes
-USE_PERL5_BUILD=yes
+USE_REINPLACE=	yes
 
 post-patch:
-	@${PERL} -pi.bak -e "s|.usr.local.qmailanalog|${QMPREFIX}|" ${WRKSRC}/conf-home
-	@${PERL} -pi.bak -e "s|-O2|${CFLAGS}|" ${WRKSRC}/conf-cc
-	@${PERL} -pi.bak -e '$$_ = "" if /cat/' ${WRKSRC}/hier.c
+	@${REINPLACE_CMD} "s|.usr.local.qmailanalog|${QMPREFIX}|" ${WRKSRC}/conf-home
+	@${REINPLACE_CMD} "s|-O2|${CFLAGS}|" ${WRKSRC}/conf-cc
+	@${REINPLACE_CMD} 's|02755|0755|g; /cat/d' ${WRKSRC}/hier.c
+	@${REINPLACE_CMD} 's|^man prog|prog|g' ${WRKSRC}/Makefile
 	@${ECHO_CMD} ${PREFIX} > ${WRKDIR}/.PPREFIX
 	@${ECHO_CMD} ${QMAIL_DIR} >> ${WRKDIR}/.PPREFIX
 
diff --git a/mail/qmailanalog/distinfo b/mail/qmailanalog/distinfo
index e35c4dd4a3c8..069df09a3ba5 100644
--- a/mail/qmailanalog/distinfo
+++ b/mail/qmailanalog/distinfo
@@ -1 +1,2 @@
 MD5 (qmailanalog-0.70.tar.gz) = 84a3d44cbf2dbd88e8b97edd98c65732
+SIZE (qmailanalog-0.70.tar.gz) = 28416
diff --git a/mail/qmailanalog/files/patch-aa b/mail/qmailanalog/files/patch-aa
deleted file mode 100644
index bd4ae68faeb3..000000000000
--- a/mail/qmailanalog/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Sun Nov 29 18:06:06 1998
-+++ Makefile	Sun Nov 29 18:06:16 1998
-@@ -214,7 +214,7 @@
- 	./compile instcheck.c
- 
- it: \
--man prog install instcheck
-+prog install instcheck
- 
- load: \
- make-load warn-auto.sh systype
diff --git a/mail/qmailanalog/files/patch-hier.c b/mail/qmailanalog/files/patch-hier.c
deleted file mode 100644
index 7b0c3652a07a..000000000000
--- a/mail/qmailanalog/files/patch-hier.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- hier.c.orig	Tue Apr 20 11:14:18 2004
-+++ hier.c	Tue Apr 20 11:14:33 2004
-@@ -2,13 +2,13 @@
- 
- void hier()
- {
--  h(auto_home,-1,-1,02755);
-+  h(auto_home,-1,-1,0755);
- 
--  d(auto_home,"bin",-1,-1,02755);
--  d(auto_home,"doc",-1,-1,02755);
--  d(auto_home,"man",-1,-1,02755);
--  d(auto_home,"man/man1",-1,-1,02755);
--  d(auto_home,"man/cat1",-1,-1,02755);
-+  d(auto_home,"bin",-1,-1,0755);
-+  d(auto_home,"doc",-1,-1,0755);
-+  d(auto_home,"man",-1,-1,0755);
-+  d(auto_home,"man/man1",-1,-1,0755);
-+  d(auto_home,"man/cat1",-1,-1,0755);
- 
-   c(auto_home,"doc","MATCHUP",-1,-1,0644);
-   c(auto_home,"doc","ACCOUNTING",-1,-1,0644);
diff --git a/mail/qmailanalog/pkg-plist b/mail/qmailanalog/pkg-plist
index c445d27eeb89..9c4d222dbeee 100644
--- a/mail/qmailanalog/pkg-plist
+++ b/mail/qmailanalog/pkg-plist
@@ -1,32 +1,32 @@
-%%MYSUBDIR%%bin/matchup
 %%MYSUBDIR%%bin/columnt
-%%MYSUBDIR%%bin/zoverall
-%%MYSUBDIR%%bin/zsendmail
-%%MYSUBDIR%%bin/xqp
-%%MYSUBDIR%%bin/xsender
-%%MYSUBDIR%%bin/xrecipient
 %%MYSUBDIR%%bin/ddist
 %%MYSUBDIR%%bin/deferrals
 %%MYSUBDIR%%bin/failures
-%%MYSUBDIR%%bin/successes
-%%MYSUBDIR%%bin/rhosts
+%%MYSUBDIR%%bin/matchup
 %%MYSUBDIR%%bin/recipients
+%%MYSUBDIR%%bin/rhosts
 %%MYSUBDIR%%bin/rxdelay
 %%MYSUBDIR%%bin/senders
+%%MYSUBDIR%%bin/successes
 %%MYSUBDIR%%bin/suids
+%%MYSUBDIR%%bin/xqp
+%%MYSUBDIR%%bin/xrecipient
+%%MYSUBDIR%%bin/xsender
 %%MYSUBDIR%%bin/zddist
 %%MYSUBDIR%%bin/zdeferrals
 %%MYSUBDIR%%bin/zfailures
-%%MYSUBDIR%%bin/zsuccesses
-%%MYSUBDIR%%bin/zrhosts
+%%MYSUBDIR%%bin/zoverall
 %%MYSUBDIR%%bin/zrecipients
+%%MYSUBDIR%%bin/zrhosts
 %%MYSUBDIR%%bin/zrxdelay
 %%MYSUBDIR%%bin/zsenders
+%%MYSUBDIR%%bin/zsendmail
+%%MYSUBDIR%%bin/zsuccesses
 %%MYSUBDIR%%bin/zsuids
-%%MYSUBDIR%%doc/MATCHUP
 %%MYSUBDIR%%doc/ACCOUNTING
-@dirrm %%MYSUBDIR%%doc
-@dirrm %%MYSUBDIR%%bin
+%%MYSUBDIR%%doc/MATCHUP
 @dirrm %%MYSUBDIR%%man/man1
 @dirrm %%MYSUBDIR%%man
+@dirrm %%MYSUBDIR%%doc
+@dirrm %%MYSUBDIR%%bin
 @dirrm %%MYSUBDIR%%