From owner-svn-ports-all@FreeBSD.ORG Thu Jun 4 06:53:45 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 377B893B; Thu, 4 Jun 2015 06:53:45 +0000 (UTC) (envelope-from jadawin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0D2A6134B; Thu, 4 Jun 2015 06:53:45 +0000 (UTC) (envelope-from jadawin@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t546rixY075228; Thu, 4 Jun 2015 06:53:44 GMT (envelope-from jadawin@FreeBSD.org) Received: (from jadawin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t546rifs075225; Thu, 4 Jun 2015 06:53:44 GMT (envelope-from jadawin@FreeBSD.org) Message-Id: <201506040653.t546rifs075225@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jadawin set sender to jadawin@FreeBSD.org using -f From: Philippe Audeoud Date: Thu, 4 Jun 2015 06:53:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388495 - head/www/surfraw X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2015 06:53:45 -0000 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@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 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 -@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 -@exec if [ ! -f %B/surfraw.bookmarks ]; then cp -p %D/%F %B/surfraw.bookmarks; fi -@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 -@exec if [ ! -f %B/surfraw.conf ]; then cp -p %D/%F %B/surfraw.conf; fi +@sample etc/surfraw.bookmarks.sample +@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 -@dirrmtry etc/bash_completion.d -@dirrm lib/surfraw