Date: Thu, 4 Feb 2010 08:53:26 +0100 (CET) From: Klaus T Aehlig <aehlig@linta.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ehaupt@FreeBSD.org Subject: ports/143540: www/uzbl [maintainer][patch] update to new version Message-ID: <20100204075326.D3286395AC@schoenfinkel.linta.de> Resent-Message-ID: <201002040800.o14801EP082764@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143540
>Category: ports
>Synopsis: www/uzbl [maintainer][patch] update to new version
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 04 08:00:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Klaus T Aehlig
>Release: FreeBSD 8.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD schoenfinkel.linta.de 8.0-STABLE FreeBSD 8.0-STABLE #6: Thu Jan 7 10:07:51 CET 2010 aehlig@schoenfinkel.linta.de:/usr/obj/usr/src/sys/SCHOENFINKEL i386
>Description:
A new version of uzbl has been released. This version brings
various improvements, in particular to uzbl-tabbed. See
http://www.uzbl.org/
>How-To-Repeat:
>Fix:
Apply the following patch.
Then (not strictly necessary) rename in the files directory
patch-examples__data__uzbl__scripts__uzbl-cookie-daemon
to patch-uzbl-cookie-daemon or, if you prefer, to
patch-examples__data__scripts__uzbl-cookie-daemon
in order to reflect that the file to patch has now a different
position in the source tree.
PS for ehaupt@
Since you're providing the backup mastersite at LOCAL/ehaupt,
could you please mirror the new tar ball as well? I've already
uploaded it to my distfile site.
--- uzbl.patch begins here ---
diff -rNu uzbl/Makefile uzbl.new/Makefile
--- uzbl/Makefile 2010-02-04 08:20:33.000000000 +0100
+++ uzbl.new/Makefile 2010-02-04 08:20:45.000000000 +0100
@@ -18,29 +18,30 @@
USE_GNOME= gtk20
USE_LDCONFIG= yes
+USE_GMAKE= yes
-GITDATE= 2010.01.05
-GITVERSION= 1958b52
+GITDATE= 2010.02.02
+GITVERSION= f8d6c93
WRKSRC= ${WRKDIR}/Dieterbe-uzbl-${GITVERSION}
post-patch:
@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
- ${WRKSRC}/examples/config/uzbl/config \
- ${WRKSRC}/uzbl-browser \
- ${WRKSRC}/examples/data/uzbl/scripts/uzbl-event-manager
+ ${WRKSRC}/examples/config/config \
+ ${WRKSRC}/src/uzbl-browser \
+ ${WRKSRC}/examples/data/scripts/uzbl-event-manager
post-build:
- @${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec rm -f {} \;
+ @${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/uzbl-core ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/uzbl-browser ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/uzbl-browser ${PREFIX}/bin
.for f in uzbl-event-manager uzbl-cookie-daemon uzbl-tabbed
- ${INSTALL_SCRIPT} ${WRKSRC}/examples/data/uzbl/scripts/${f} ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/examples/data/scripts/${f} ${PREFIX}/bin
.endfor
${MKDIR} ${DATADIR}/docs
- ${INSTALL_DATA} ${WRKSRC}/config.h ${DATADIR}/docs
+ ${INSTALL_DATA} ${WRKSRC}/src/config.h ${DATADIR}/docs
.for f in COMMUNITY CONTRIBUTING FAQ INSTALL TODO config-syntax \
multiple-instances-management performance url-editing
${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DATADIR}/docs
@@ -48,17 +49,17 @@
.for f in AUTHORS README
${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}/docs
.endfor
- ${MKDIR} ${DATADIR}/examples/config/uzbl \
- ${DATADIR}/examples/data/uzbl/forms
-.for f in examples/config/uzbl/config examples/config/uzbl/cookies \
- examples/data/uzbl/bookmarks \
- examples/data/uzbl/forms/bbs.archlinux.org \
- examples/data/uzbl/style.css examples/data/uzbl/uzbl.png
+ ${MKDIR} ${DATADIR}/examples/config \
+ ${DATADIR}/examples/data/forms
+.for f in examples/config/config examples/config/cookies \
+ examples/data/bookmarks \
+ examples/data/forms/bbs.archlinux.org \
+ examples/data/style.css examples/data/uzbl.png
${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}/${f}
.endfor
- (cd ${WRKSRC}/examples/data/uzbl && \
- ${COPYTREE_BIN} plugins ${DATADIR}/examples/data/uzbl)
- (cd ${WRKSRC}/examples/data/uzbl && \
- ${COPYTREE_BIN} scripts ${DATADIR}/examples/data/uzbl)
+ (cd ${WRKSRC}/examples/data && \
+ ${COPYTREE_BIN} plugins ${DATADIR}/examples/data/)
+ (cd ${WRKSRC}/examples/data && \
+ ${COPYTREE_BIN} scripts ${DATADIR}/examples/data/)
.include <bsd.port.mk>
diff -rNu uzbl/distinfo uzbl.new/distinfo
--- uzbl/distinfo 2010-02-04 08:20:33.000000000 +0100
+++ uzbl.new/distinfo 2010-02-04 08:20:45.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (uzbl-0.0.0.2010.01.05.tar.gz) = 2574fc68a7a7693297d371ca58a4edb4
-SHA256 (uzbl-0.0.0.2010.01.05.tar.gz) = 0aae5c9994d968b4f4ec7f8f2ce935c25e25d19cabbce27e3ded0672756132c8
-SIZE (uzbl-0.0.0.2010.01.05.tar.gz) = 133875
+MD5 (uzbl-0.0.0.2010.02.02.tar.gz) = 70a5d47655d5ec11f68ff5b7a7bd68b5
+SHA256 (uzbl-0.0.0.2010.02.02.tar.gz) = 23b1e7b7b0ce40605e838f2af70cabd7f430a4f4b55f0b7e73a89296c40f2a6a
+SIZE (uzbl-0.0.0.2010.02.02.tar.gz) = 136063
diff -rNu uzbl/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon uzbl.new/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon
--- uzbl/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon 2010-02-04 08:20:33.000000000 +0100
+++ uzbl.new/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon 2010-02-04 08:20:45.000000000 +0100
@@ -1,5 +1,5 @@
---- ./examples/data/uzbl/scripts/uzbl-cookie-daemon.orig 2010-01-05 20:17:29.000000000 +0100
-+++ ./examples/data/uzbl/scripts/uzbl-cookie-daemon 2010-01-07 13:24:58.000000000 +0100
+--- ./examples/data/scripts/uzbl-cookie-daemon.orig 2010-01-05 20:17:29.000000000 +0100
++++ ./examples/data/scripts/uzbl-cookie-daemon 2010-01-07 13:24:58.000000000 +0100
@@ -187,7 +187,7 @@
raise Exception("directory at %r is not a socket" % cookie_socket)
diff -rNu uzbl/files/patch-uzbl-core.c uzbl.new/files/patch-uzbl-core.c
--- uzbl/files/patch-uzbl-core.c 2010-02-04 08:20:33.000000000 +0100
+++ uzbl.new/files/patch-uzbl-core.c 2010-02-04 08:20:45.000000000 +0100
@@ -1,5 +1,5 @@
---- uzbl-core.c.orig 2010-01-05 20:17:29.000000000 +0100
-+++ uzbl-core.c 2010-01-08 10:13:45.000000000 +0100
+--- src/uzbl-core.c.orig 2010-01-05 20:17:29.000000000 +0100
++++ src/uzbl-core.c 2010-01-08 10:13:45.000000000 +0100
@@ -29,6 +29,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
diff -rNu uzbl/pkg-plist uzbl.new/pkg-plist
--- uzbl/pkg-plist 2010-02-04 08:20:33.000000000 +0100
+++ uzbl.new/pkg-plist 2010-02-04 08:20:45.000000000 +0100
@@ -15,48 +15,46 @@
%%DATADIR%%/docs/config.h
%%DATADIR%%/docs/AUTHORS
%%DATADIR%%/docs/README
-%%DATADIR%%/examples/config/uzbl/config
-%%DATADIR%%/examples/config/uzbl/cookies
-%%DATADIR%%/examples/data/uzbl/forms/bbs.archlinux.org
-%%DATADIR%%/examples/data/uzbl/plugins/progress_bar.py
-%%DATADIR%%/examples/data/uzbl/plugins/completion.py
-%%DATADIR%%/examples/data/uzbl/plugins/config.py
-%%DATADIR%%/examples/data/uzbl/plugins/keycmd.py
-%%DATADIR%%/examples/data/uzbl/plugins/mode.py
-%%DATADIR%%/examples/data/uzbl/plugins/on_event.py
-%%DATADIR%%/examples/data/uzbl/plugins/plugin_template.py
-%%DATADIR%%/examples/data/uzbl/plugins/bind.py
-%%DATADIR%%/examples/data/uzbl/scripts/uzblcat
-%%DATADIR%%/examples/data/uzbl/scripts/download.sh
-%%DATADIR%%/examples/data/uzbl/scripts/extedit.js
-%%DATADIR%%/examples/data/uzbl/scripts/follow_Numbers.js
-%%DATADIR%%/examples/data/uzbl/scripts/follow_Numbers_Strings.js
-%%DATADIR%%/examples/data/uzbl/scripts/formfiller.pl
-%%DATADIR%%/examples/data/uzbl/scripts/formfiller.sh
-%%DATADIR%%/examples/data/uzbl/scripts/hint.js
-%%DATADIR%%/examples/data/uzbl/scripts/history.sh
-%%DATADIR%%/examples/data/uzbl/scripts/insert_bookmark.sh
-%%DATADIR%%/examples/data/uzbl/scripts/instance-select-wmii.sh
-%%DATADIR%%/examples/data/uzbl/scripts/linkfollow.js
-%%DATADIR%%/examples/data/uzbl/scripts/load_url_from_bookmarks.sh
-%%DATADIR%%/examples/data/uzbl/scripts/load_url_from_history.sh
-%%DATADIR%%/examples/data/uzbl/scripts/scheme.py
-%%DATADIR%%/examples/data/uzbl/scripts/scroll-percentage.js
-%%DATADIR%%/examples/data/uzbl/scripts/session.sh
-%%DATADIR%%/examples/data/uzbl/scripts/uzbl-cookie-daemon
-%%DATADIR%%/examples/data/uzbl/scripts/uzbl-tabbed
-%%DATADIR%%/examples/data/uzbl/scripts/uzbl-event-manager
-%%DATADIR%%/examples/data/uzbl/scripts/cookies.sh
-%%DATADIR%%/examples/data/uzbl/bookmarks
-%%DATADIR%%/examples/data/uzbl/style.css
-%%DATADIR%%/examples/data/uzbl/uzbl.png
+%%DATADIR%%/examples/config/config
+%%DATADIR%%/examples/config/cookies
+%%DATADIR%%/examples/data/forms/bbs.archlinux.org
+%%DATADIR%%/examples/data/plugins/progress_bar.py
+%%DATADIR%%/examples/data/plugins/cmd_expand.py
+%%DATADIR%%/examples/data/plugins/completion.py
+%%DATADIR%%/examples/data/plugins/config.py
+%%DATADIR%%/examples/data/plugins/keycmd.py
+%%DATADIR%%/examples/data/plugins/mode.py
+%%DATADIR%%/examples/data/plugins/on_event.py
+%%DATADIR%%/examples/data/plugins/plugin_template.py
+%%DATADIR%%/examples/data/plugins/bind.py
+%%DATADIR%%/examples/data/scripts/uzblcat
+%%DATADIR%%/examples/data/scripts/download.sh
+%%DATADIR%%/examples/data/scripts/extedit.js
+%%DATADIR%%/examples/data/scripts/follow.js
+%%DATADIR%%/examples/data/scripts/formfiller.pl
+%%DATADIR%%/examples/data/scripts/formfiller.sh
+%%DATADIR%%/examples/data/scripts/hint.js
+%%DATADIR%%/examples/data/scripts/history.sh
+%%DATADIR%%/examples/data/scripts/insert_bookmark.sh
+%%DATADIR%%/examples/data/scripts/instance-select-wmii.sh
+%%DATADIR%%/examples/data/scripts/linkfollow.js
+%%DATADIR%%/examples/data/scripts/load_url_from_bookmarks.sh
+%%DATADIR%%/examples/data/scripts/load_url_from_history.sh
+%%DATADIR%%/examples/data/scripts/scheme.py
+%%DATADIR%%/examples/data/scripts/scroll-percentage.js
+%%DATADIR%%/examples/data/scripts/session.sh
+%%DATADIR%%/examples/data/scripts/uzbl-cookie-daemon
+%%DATADIR%%/examples/data/scripts/uzbl-tabbed
+%%DATADIR%%/examples/data/scripts/uzbl-event-manager
+%%DATADIR%%/examples/data/scripts/cookies.sh
+%%DATADIR%%/examples/data/bookmarks
+%%DATADIR%%/examples/data/style.css
+%%DATADIR%%/examples/data/uzbl.png
@dirrm %%DATADIR%%/docs
-@dirrm %%DATADIR%%/examples/config/uzbl
@dirrm %%DATADIR%%/examples/config
-@dirrm %%DATADIR%%/examples/data/uzbl/forms
-@dirrm %%DATADIR%%/examples/data/uzbl/plugins
-@dirrm %%DATADIR%%/examples/data/uzbl/scripts
-@dirrm %%DATADIR%%/examples/data/uzbl
+@dirrm %%DATADIR%%/examples/data/forms
+@dirrm %%DATADIR%%/examples/data/plugins
+@dirrm %%DATADIR%%/examples/data/scripts
@dirrm %%DATADIR%%/examples/data
@dirrm %%DATADIR%%/examples
@dirrm %%DATADIR%%
--- uzbl.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100204075326.D3286395AC>