- Update to 2010.02.02

PR:		ports/143540
Submitted by:	Klaus T. Aehlig <aehilig@linta.de> (maintainer)
Approved by:	itetcu (mentor)
Feature safe:	yes

5 files changed, 46 insertions, 88 deletions

diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile
index 18b6bd0af92e..2ad40d8d65b1 100644
--- a/www/uzbl/Makefile
+++ b/www/uzbl/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	uzbl
 DISTVERSION=	0.0.0.${GITDATE}
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.linta.de/distfiles/ \
 		LOCAL/ehaupt
@@ -19,47 +18,63 @@ LIB_DEPENDS=	webkit:${PORTSDIR}/www/webkit-gtk2
 
 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}
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	AUTHORS README COMMUNITY CONTRIBUTING FAQ INSTALL TODO config-syntax \
+		multiple-instances-management performance url-editing config.h
+.endif
+
+.if !defined(NOPORTDATA)
+PORTDATA=	examples
+.endif
+
 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
+	@${REINPLACE_CMD} -e "s|share/uzbl|${DATADIR_REL}|" \
+		${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
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/config.h ${DOCSDIR}
 .for f in COMMUNITY CONTRIBUTING FAQ INSTALL TODO config-syntax \
 		multiple-instances-management performance url-editing
-	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DATADIR}/docs
+	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}/${f}
 .endfor
 .for f in AUTHORS README
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}/docs
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/${f}
 .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
-		${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}/${f}
+.endif
+.if !defined(NOPORTDATA)
+	${MKDIR} ${DATADIR}/examples/data/forms ${DATADIR}/examples/config
+.for f in config/cookies \
+	data/bookmarks \
+	data/forms/bbs.archlinux.org \
+	data/style.css data/uzbl.png
+		${INSTALL_DATA} ${WRKSRC}/examples/${f} ${DATADIR}/examples/${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)
+	${INSTALL_DATA} ${WRKSRC}/examples/config/config ${DATADIR}/examples/config/config
+	(cd ${WRKSRC}/examples/data && \
+		${COPYTREE_BIN} plugins ${DATADIR}/examples/data/)
+	(cd ${WRKSRC}/examples/data && \
+		${COPYTREE_BIN} scripts ${DATADIR}/examples/data/)
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/uzbl/distinfo b/www/uzbl/distinfo
index 5d58a9c6386d..997c1141fce6 100644
--- a/www/uzbl/distinfo
+++ b/www/uzbl/distinfo
@@ -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 --git a/www/uzbl/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon b/www/uzbl/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon
index 49530c2e171b..6e000260f79c 100644
--- a/www/uzbl/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon
+++ b/www/uzbl/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon
@@ -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 --git a/www/uzbl/files/patch-uzbl-core.c b/www/uzbl/files/patch-uzbl-core.c
index 89712e2053bc..cbea01208cb6 100644
--- a/www/uzbl/files/patch-uzbl-core.c
+++ b/www/uzbl/files/patch-uzbl-core.c
@@ -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 --git a/www/uzbl/pkg-plist b/www/uzbl/pkg-plist
index 7219d7fd51a5..4a0cd50787d6 100644
--- a/www/uzbl/pkg-plist
+++ b/www/uzbl/pkg-plist
@@ -3,60 +3,3 @@ bin/uzbl-browser
 bin/uzbl-cookie-daemon
 bin/uzbl-event-manager
 bin/uzbl-tabbed
-%%DATADIR%%/docs/url-editing
-%%DATADIR%%/docs/CONTRIBUTING
-%%DATADIR%%/docs/FAQ
-%%DATADIR%%/docs/INSTALL
-%%DATADIR%%/docs/TODO
-%%DATADIR%%/docs/config-syntax
-%%DATADIR%%/docs/multiple-instances-management
-%%DATADIR%%/docs/performance
-%%DATADIR%%/docs/COMMUNITY
-%%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
-@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
-@dirrm %%DATADIR%%/examples
-@dirrm %%DATADIR%%