svn commit: r388495 - head/www/surfraw

[Philippe Audeoud]

Author: jadawin
Date: Thu Jun  4 06:53:43 2015
New Revision: 388495
URL: https://svnweb.freebsd.org/changeset/ports/388495

Log:
  - Fix shebangs
  - Don't install config files without .sample suffix, these are handled by pkg
  - Remove MLINKS, unneeded with pkg
  - Use @sample
  - Remove @dirrm* from plist
  
  PR:		200038
  Submitted by:	amdmi3@

Deleted:
  head/www/surfraw/manpages
Modified:
  head/www/surfraw/Makefile
  head/www/surfraw/pkg-plist

Modified: head/www/surfraw/Makefile
==============================================================================
--- head/www/surfraw/Makefile	Thu Jun  4 06:45:37 2015	(r388494)
+++ head/www/surfraw/Makefile	Thu Jun  4 06:53:43 2015	(r388495)
@@ -2,6 +2,7 @@
 
 PORTNAME=	surfraw
 PORTVERSION=	2.2.9
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://surfraw.alioth.debian.org/dist/
 
@@ -9,7 +10,10 @@ MAINTAINER=	jadawin at FreeBSD.org
 COMMENT=	Command line interface to popular WWW search engines
 
 GNU_CONFIGURE=	yes
-USES=		perl5 gmake
+USES=		gmake perl5 shebangfix
+SHEBANG_FILES=	opensearch-discover \
+		opensearch-genquery \
+		surfraw-update-path.IN
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} '\|xdg/surfraw|d' ${WRKSRC}/Makefile.in
@@ -25,11 +29,6 @@ post-install:
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/surfraw
 .for f in surfraw.bookmarks surfraw.conf
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/etc/${f}.sample
-	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/${f} ]; then \
-		${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/${f}.sample \
-			${STAGEDIR}${PREFIX}/etc/${f}; \
-	fi
 .endfor
 
-.include "${.CURDIR}/manpages"
 .include <bsd.port.mk>

Modified: head/www/surfraw/pkg-plist
==============================================================================
--- head/www/surfraw/pkg-plist	Thu Jun  4 06:45:37 2015	(r388494)
+++ head/www/surfraw/pkg-plist	Thu Jun  4 06:53:43 2015	(r388495)
@@ -5,12 +5,8 @@ bin/surfraw
 bin/surfraw-update-path
 bin/uzbl_load_url_from_surfraw
 etc/bash_completion.d/surfraw
- at unexec if cmp -s %D/etc/surfraw.bookmarks.sample %D/etc/surfraw.bookmarks; then rm -f %D/etc/surfraw.bookmarks; fi
-etc/surfraw.bookmarks.sample
- at exec if [ ! -f %B/surfraw.bookmarks ]; then cp -p %D/%F %B/surfraw.bookmarks; fi
- at unexec if cmp -s %D/etc/surfraw.conf.sample %D/etc/surfraw.conf; then rm -f %D/etc/surfraw.conf; fi
-etc/surfraw.conf.sample
- at exec if [ ! -f %B/surfraw.conf ]; then cp -p %D/%F %B/surfraw.conf; fi
+ at sample etc/surfraw.bookmarks.sample
+ at sample etc/surfraw.conf.sample
 lib/surfraw/W
 lib/surfraw/acronym
 lib/surfraw/ads
@@ -257,5 +253,3 @@ man/man1/yahoo.1sr.gz
 man/man1/yandex.1sr.gz
 man/man1/youtube.1sr.gz
 man/man1/yubnub.1sr.gz
- at dirrmtry etc/bash_completion.d
- at dirrm lib/surfraw