- relocate PKGMESSAGE and unbreak this port

- replace files/patch-* with REINPLACE_CMD

3 files changed, 11 insertions, 42 deletions

diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile
index 7f2164e879ea..9e33e6e7513b 100644
--- a/net-mgmt/cricket/Makefile
+++ b/net-mgmt/cricket/Makefile
@@ -33,6 +33,16 @@ CRICKET_USER?=	wwwadm
 CRICKET_UID?=	81
 CRICKET_GROUP?=	www
 CRICKET_GID?=	80
+USE_REINPLACE=	yes
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,/home/cricket,${PREFIX},g' \
+		${WRKSRC}/cricket-conf.pl.sample
+	@${REINPLACE_CMD} -e 's,/usr/local/net/bin/ssh,/usr/bin/ssh,g' \
+		${WRKSRC}/sample-config/news-server/Defaults
+	@${SED} -e 's,%%PREFIX%%,${PREFIX},' ${FILESDIR}/pkg-message.in > \
+		${PKGMESSAGE}
 
 do-install:
 	@PREFIX="${PREFIX}" USER="${CRICKET_USER}" GROUP="${CRICKET_GROUP}" \
@@ -53,12 +63,9 @@ do-install:
 		${ECHO_MSG} "You should migrate manually to use new cricket"; \
 		${ECHO_MSG} "installation scheme."; \
 	fi
+	@${INSTALL_DATA} ${WRKSRC}/cricket-conf.pl.sample ${PREFIX}/etc/cricket-conf.pl.dist
 
 post-install:
-	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/cricket-conf.pl.sample \
-		> ${PREFIX}/etc/cricket-conf.pl.dist
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},' ${FILESDIR}/pkg-message.in > \
-		${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/cricket/files/patch-cricket-conf.pl.sample b/net-mgmt/cricket/files/patch-cricket-conf.pl.sample
deleted file mode 100644
index fbf2999a1eec..000000000000
--- a/net-mgmt/cricket/files/patch-cricket-conf.pl.sample
+++ /dev/null
@@ -1,19 +0,0 @@
-*** cricket-conf.pl.sample.orig	Wed Apr 10 00:28:27 2002
---- cricket-conf.pl.sample	Wed Jun  5 19:29:38 2002
-***************
-*** 13,19 ****
-  #	$Id: cricket-conf.pl.sample,v 1.5 2002/04/09 23:28:27 driehuis Exp $
-  package Common::global;
-  
-! $gCricketHome = "/home/cricket";
-  $gInstallRoot = "$gCricketHome/cricket";
-  #$gConfigRoot = "$gCricketHome/cricket-config";
-  
---- 13,19 ----
-  #	$Id: cricket-conf.pl.sample,v 1.5 2002/04/09 23:28:27 driehuis Exp $
-  package Common::global;
-  
-! $gCricketHome = "%%PREFIX%%/cricket";
-  $gInstallRoot = "$gCricketHome/cricket";
-  #$gConfigRoot = "$gCricketHome/cricket-config";
-  
diff --git a/net-mgmt/cricket/files/patch-sample-config::news-server::Defaults b/net-mgmt/cricket/files/patch-sample-config::news-server::Defaults
deleted file mode 100644
index fa97de2b827e..000000000000
--- a/net-mgmt/cricket/files/patch-sample-config::news-server::Defaults
+++ /dev/null
@@ -1,19 +0,0 @@
-*** sample-config/news-server/Defaults.orig	Thu Oct 25 00:27:29 2001
---- sample-config/news-server/Defaults	Wed Jun  5 16:55:45 2002
-***************
-*** 11,17 ****
-      # you'll probably want to change this... unless you
-      # have Cricket in ~/cricket and your config tree in ~/config
-      util-dir    =   %auto-base%/../cricket/util
-!     remexec     =   "/usr/local/net/bin/ssh -l %user% %server%"
-      user        =   news
-      server      =   nntp-host
-      target-type =   news-server
---- 11,17 ----
-      # you'll probably want to change this... unless you
-      # have Cricket in ~/cricket and your config tree in ~/config
-      util-dir    =   %auto-base%/../cricket/util
-!     remexec     =   "/usr/bin/ssh -l %user% %server%"
-      user        =   news
-      server      =   nntp-host
-      target-type =   news-server