Bug 146977 - [patch] www/surfraw: update to 2.2.7
[patch] www/surfraw: update to 2.2.7
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: Philippe Audeoud
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2010-05-25 22:30 UTC by swell.k
Modified: 2010-06-24 13:21 UTC (History)
0 users

See Also:


Attachments
a.diff (12.79 KB, patch)
2010-05-25 22:30 UTC, swell.k
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description swell.k 2010-05-25 22:30:01 UTC
- update
- dispose of pkg-{,de}install scripts along with bug affecting
  non-/usr/local PREFIX and removing surfaw.{bookmarks,conf}
  during deinstall
- dispose of EXAMPLESDIR -> use .sample suffix
- move manlinks to Makefile (actually ${.CURDIR}/mlinks)
- sort MAN1

UPDATING notes:
- EXAMPLESDIR/surfaw.conf -> etc/surfaw.conf.sample

- do_notice() and do_install() are lost, most ports use .sample files
  without any kind of information notices. If this becomes frequent
  issue for updating users one can add echo in `else' statement for
  `cmp' comparison like sysutils/screen does.

    @unexec if cmp -s %D/etc/surfraw.bookmarks.sample %D/etc/surfraw.bookmarks; then rm -f %D/etc/surfraw.bookmarks; else echo If permanently deleting this package, %D/etc/surfaw.bookmarks must be removed manually; fi
Comment 1 Edwin Groothuis freebsd_committer 2010-05-25 22:30:15 UTC
Responsible Changed
From-To: freebsd-ports-bugs->jadawin

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 swell.k 2010-05-25 23:05:18 UTC
Oops, forgot about bash completion and uzbl_load_url (uses x11/dmenu).
--- a.diff begins here ---
diff --git www/surfraw/Makefile www/surfraw/Makefile
index e568d22..5f7bc86 100644
--- www/surfraw/Makefile
+++ www/surfraw/Makefile
@@ -24,8 +24,16 @@ MAN1=	elvi.1sr \
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} '\|xdg/surfraw|d' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's|/bin/bash|${SH}|g' \
+		-e 's/^function[[:space:]]//' \
+		${WRKSRC}/examples/uzbl_load_url_from_surfraw.IN
 
 post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/uzbl_load_url_from_surfraw \
+		${PREFIX}/bin
+	${MKDIR} ${PREFIX}/etc/bash_completion.d
+	${INSTALL_DATA} ${WRKSRC}/surfraw-bash-completion \
+		${PREFIX}/etc/bash_completion.d/surfraw
 .for f in surfraw.bookmarks surfraw.conf
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/etc/${f}.sample
 	@if [ ! -f ${PREFIX}/etc/${f} ]; then \
diff --git www/surfraw/pkg-plist www/surfraw/pkg-plist
index 422d470..e42e823 100644
--- www/surfraw/pkg-plist
+++ www/surfraw/pkg-plist
@@ -3,6 +3,8 @@ bin/opensearch-genquery
 bin/sr
 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
@@ -113,4 +115,5 @@ lib/surfraw/woffle
 lib/surfraw/yahoo
 lib/surfraw/youtube
 lib/surfraw/yubnub
+@dirrmtry etc/bash_completion.d
 @dirrm lib/surfraw
--- a.diff ends here ---
Comment 3 dfilter freebsd_committer 2010-06-24 12:27:13 UTC
jadawin     2010-06-24 11:24:43 UTC

  FreeBSD ports repository

  Modified files:
    www/surfraw          Makefile distinfo pkg-plist 
  Removed files:
    www/surfraw          pkg-deinstall pkg-install 
  Log:
  - Update to 2.2.7
  
  PR:             ports/146977
  Submitted by:   Anonymous <swell.k _AT_ gmail.com>
  Feature safe:   yes
  
  Revision  Changes    Path
  1.22      +24 -8     ports/www/surfraw/Makefile
  1.15      +3 -3      ports/www/surfraw/distinfo
  1.3       +0 -53     ports/www/surfraw/pkg-deinstall (dead)
  1.2       +0 -67     ports/www/surfraw/pkg-install (dead)
  1.13      +29 -94    ports/www/surfraw/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 4 Philippe Audeoud freebsd_committer 2010-06-24 13:21:49 UTC
State Changed
From-To: open->closed

Committed. Thanks!