svn commit: r359486 - head/net/gofish

[Jason E. Hale]

Author: jhale
Date: Fri Jun 27 09:23:45 2014
New Revision: 359486
URL: http://svnweb.freebsd.org/changeset/ports/359486
QAT: https://qat.redports.org/buildarchive/r359486/

Log:
  - Support staging
  - Add LICENSE
  - Use @sample in pkg-plist
  
  Approved by:	portmgr (blanket approval)

Modified:
  head/net/gofish/Makefile
  head/net/gofish/pkg-plist

Modified: head/net/gofish/Makefile
==============================================================================
--- head/net/gofish/Makefile	Fri Jun 27 09:21:13 2014	(r359485)
+++ head/net/gofish/Makefile	Fri Jun 27 09:23:45 2014	(r359486)
@@ -9,6 +9,8 @@ MASTER_SITES=	SF
 MAINTAINER=	kaiw27 at gmail.com
 COMMENT=	GoFish Gopher Server
 
+LICENSE=	GPLv2
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 GOPHERROOT?=	${PREFIX}/gopher
 GOPHERUSER?=	nobody
@@ -17,20 +19,8 @@ CONFIGURE_ARGS=	--with-gopherroot=${GOPH
 		--with-gopheruser=${GOPHERUSER}
 MAKE_ENV=	localstatedir=/var
 
-MAN1=		gofish.1 mkcache.1
-MAN5=		dotcache.5 gofish.5
-MLINKS=		gofish.1 gopherd.1
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-post-install:
-.for i in ${PREFIX}/etc/gofish.conf ${PREFIX}/etc/gofish-www.conf
-	if test -f ${i}.new; then \
-		${MV} ${i}.new ${i}.sample; \
-	else \
-		${CP} -p ${i} ${i}.sample; \
-	fi
-.endfor
+post-patch:
+	${REINPLACE_CMD} -e '/$$(sysconfdir)\/gofish/s|.conf|.conf.sample|3' \
+		${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/gofish/pkg-plist
==============================================================================
--- head/net/gofish/pkg-plist	Fri Jun 27 09:21:13 2014	(r359485)
+++ head/net/gofish/pkg-plist	Fri Jun 27 09:23:45 2014	(r359486)
@@ -1,16 +1,10 @@
-bin/mkcache
 bin/check-files
- at unexec if cmp -s %D/etc/gofish.conf.sample %D/etc/gofish.conf; then rm -f %D/etc/gofish.conf; fi
-etc/gofish.conf.sample
- at exec if [ ! -f %D/etc/gofish.conf ] ; then cp -p %D/%F %B/gofish.conf; fi
- at unexec if cmp -s %D/etc/gofish-www.conf.sample %D/etc/gofish-www.conf; then rm -f %D/etc/gofish-www.conf; fi
-etc/gofish-www.conf.sample
- at exec if [ ! -f %D/etc/gofish-www.conf ] ; then cp -p %D/%F %B/gofish-www.conf; fi
-sbin/gofish
-sbin/gopherd
-gopher/Configure_GoFish
+bin/mkcache
+ at sample etc/gofish-www.conf.sample
+ at sample etc/gofish.conf.sample
 gopher/.cache
 gopher/.gopher+
+gopher/Configure_GoFish
 gopher/icons/gofish.gif
 gopher/icons/gopher_binary.gif
 gopher/icons/gopher_html.gif
@@ -18,5 +12,12 @@ gopher/icons/gopher_image.gif
 gopher/icons/gopher_menu.gif
 gopher/icons/gopher_text.gif
 gopher/icons/gopher_unknown.gif
+man/man1/gofish.1.gz
+man/man1/gopherd.1.gz
+man/man1/mkcache.1.gz
+man/man5/dotcache.5.gz
+man/man5/gofish.5.gz
+sbin/gofish
+sbin/gopherd
 @dirrm gopher/icons
 @dirrm gopher