From nobody@FreeBSD.org  Sat Dec 15 18:20:23 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A85FFF2E
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 15 Dec 2012 18:20:23 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 8EDBA8FC13
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 15 Dec 2012 18:20:23 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qBFIKNI1090583
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 15 Dec 2012 18:20:23 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qBFIKNp4090582;
	Sat, 15 Dec 2012 18:20:23 GMT
	(envelope-from nobody)
Message-Id: <201212151820.qBFIKNp4090582@red.freebsd.org>
Date: Sat, 15 Dec 2012 18:20:23 GMT
From: Green Dog <fiziologus@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [update] www/luakit to 2012.09.13-r1
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: gugabsd@mundounix.com.br

>Number:         174457
>Category:       ports
>Synopsis:       [update] www/luakit to 2012.09.13-r1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 15 18:30:00 UTC 2012
>Closed-Date:    Mon Feb 18 23:03:05 UTC 2013
>Last-Modified:  Mon Feb 18 23:10:00 UTC 2013
>Originator:     Green Dog
>Release:        FreeBSD-9.0
>Organization:
>Environment:
>Description:
update www/luakit to 2012.09.13-r1

USE_GITHUB instead direct download

REINPLACE_CMD instead patch
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN luakit.orig/Makefile luakit/Makefile
--- luakit.orig/Makefile	2012-11-17 10:02:39.000000000 +0400
+++ luakit/Makefile	2012-12-15 22:15:31.000000000 +0400
@@ -6,10 +6,8 @@
 #
 
 PORTNAME=	luakit
-PORTVERSION=	2011.07.22
-PORTREVISION=	1
+PORTVERSION=	2012.09.13r1
 CATEGORIES=	www
-MASTER_SITES=	https://github.com/mason-larobina/${PORTNAME}/tarball/${PORTVERSION}-r1/
 
 MAINTAINER=	gugabsd@mundounix.com.br
 COMMENT=	Fast, small, webkit based browser framework extensible by Lua
@@ -17,18 +15,21 @@
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/help2man:${PORTSDIR}/misc/help2man
-LIB_DEPENDS=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \
-		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS=	webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 \
+		sqlite3:${PORTSDIR}/databases/sqlite3 \
+		unique-1.0:${PORTSDIR}/x11-toolkits/unique
 RUN_DEPENDS=	${LUA_MODLIBDIR}/lfs.so:${PORTSDIR}/devel/luafilesystem
 
-GITVERSION=	b1fb7fa
-FETCH_ARGS=	-pRr
-WRKSRC=		${WRKDIR}/mason-larobina-${PORTNAME}-${GITVERSION}
+USE_GITHUB=	yes
+GH_ACCOUNT=	mason-larobina
+GH_PROGECT=	${PORTNAME}
+GH_TAGNAME=	${PORTVERSION:C/r/-r/}
+GH_COMMIT=	0d5f4ab
 
 USE_GMAKE=	yes
 USE_GNOME=	glib20 gtk20 pkgconfig
-USE_LUA=	5.1+
+USE_LUA=	5.1
+MAKE_ARGS+=	USE_UNIQUE=1 NO_JAVASCRIPTCORE=1
 
 MAN1=		luakit.1
 
@@ -42,9 +43,9 @@
 
 .if defined(WITH_LUAJIT)
 LIB_DEPENDS+=	luajit:${PORTSDIR}/lang/luajit
-CONFIGURE_ARGS+=USE_LUAJIT=1
+MAKE_ARGS+=	USE_LUAJIT=1
 .else
-CONFIGURE_ARGS+=USE_LUAJIT=0
+MAKE_ARGS+=	USE_LUAJIT=0
 .endif
 
 post-patch:
@@ -52,5 +53,11 @@
 		-e 's|(DESTDIR)|(INSTALLDIR)|' ${WRKSRC}/Makefile
 	@${SED} -I "" 's|/etc/xdg/luakit|${LOCALBASE}&|' \
 		${WRKSRC}/lib/lousy/util.lua
+	@${REINPLACE_CMD} -e \
+		's|share/man|man| ; s|luakit/docs|doc/luakit| ; \
+		/MANPREFIX */s|?=|=|' \
+		${WRKSRC}/config.mk
+	@${REINPLACE_CMD} -e 's|bin/env lua|local/bin/lua-5.1|' \
+		${WRKSRC}/build-utils/gentokens.lua
 
 .include <bsd.port.mk>
diff -ruN luakit.orig/distinfo luakit/distinfo
--- luakit.orig/distinfo	2012-04-15 00:37:06.000000000 +0400
+++ luakit/distinfo	2012-12-15 20:02:58.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (luakit-2011.07.22.tar.gz) = 8a0d5ce7657de5dde270a691911b26822cb3259b8bf5a0fcf6c02f7748ad4a3d
-SIZE (luakit-2011.07.22.tar.gz) = 148704
+SHA256 (luakit-2012.09.13r1.tar.gz) = 688950fda11f032976998b52ba6505fc1bf5bba40552293f9ddc748b00f76132
+SIZE (luakit-2012.09.13r1.tar.gz) = 215431
diff -ruN luakit.orig/files/patch-config.mk luakit/files/patch-config.mk
--- luakit.orig/files/patch-config.mk	2012-04-15 00:37:06.000000000 +0400
+++ luakit/files/patch-config.mk	1970-01-01 03:00:00.000000000 +0300
@@ -1,16 +0,0 @@
-diff -r 1a525885c788 config.mk
---- config.mk Fri Mar 23 23:55:52 2012 -0300
-+++ config.mk Fri Mar 23 23:57:41 2012 -0300
-@@ -5,10 +5,10 @@
- PREFIX     ?= /usr/local
- INSTALLDIR := $(DESTDIR)$(PREFIX)
- 
--MANPREFIX  ?= $(PREFIX)/share/man
-+MANPREFIX  := $(PREFIX)/man
- MANPREFIX  := $(DESTDIR)$(MANPREFIX)
- 
--DOCDIR     ?= $(PREFIX)/share/luakit/docs
-+DOCDIR     ?= $(PREFIX)/share/doc/luakit
- DOCDIR     := $(DESTDIR)$(DOCDIR)
- 
- # Use the Just-In-Time compiler for lua (for faster lua code execution)
diff -ruN luakit.orig/files/patch-gentokens luakit/files/patch-gentokens
--- luakit.orig/files/patch-gentokens	2012-04-15 00:37:06.000000000 +0400
+++ luakit/files/patch-gentokens	1970-01-01 03:00:00.000000000 +0300
@@ -1,9 +0,0 @@
-diff -r 25cc3a246cba build-utils/gentokens.lua
---- build-utils/gentokens.lua Fri Mar 23 22:32:16 2012 -0300
-+++ build-utils/gentokens.lua Fri Mar 23 22:33:52 2012 -0300
-@@ -1,4 +1,4 @@
--#!/usr/bin/env lua
-+#!/usr/local/bin/lua-5.1
- 
- -- build-utils/gentokens.lua - gen tokenize lib
- --
diff -ruN luakit.orig/pkg-plist luakit/pkg-plist
--- luakit.orig/pkg-plist	2012-11-17 10:02:39.000000000 +0400
+++ luakit/pkg-plist	2012-12-15 22:02:35.000000000 +0400
@@ -1,4 +1,3 @@
-@comment $FreeBSD: ports/www/luakit/pkg-plist,v 1.2 2012/11/17 06:02:39 svnexp Exp $
 bin/luakit
 etc/xdg/luakit/binds.lua
 etc/xdg/luakit/globals.lua
@@ -12,26 +11,16 @@
 share/doc/luakit/AUTHORS
 share/doc/luakit/COPYING
 share/doc/luakit/COPYING.GPLv3
-share/luakit/lib/lousy/widget/init.lua
-share/luakit/lib/lousy/widget/menu.lua
-share/luakit/lib/lousy/widget/tablist.lua
-share/luakit/lib/lousy/init.lua
-share/luakit/lib/lousy/mode.lua
-share/luakit/lib/lousy/signal.lua
-share/luakit/lib/lousy/bind.lua
-share/luakit/lib/lousy/uri.lua
-share/luakit/lib/lousy/util.lua
-share/luakit/lib/lousy/theme.lua
-share/luakit/lib/follow/binds.lua
-share/luakit/lib/follow/init.lua
-share/luakit/lib/follow/modes.lua
-share/luakit/lib/follow/styles.lua
+share/luakit/lib/bookmarks.lua
+share/luakit/lib/bookmarks_chrome.lua
+share/luakit/lib/chrome.lua
 share/luakit/lib/cmdhist.lua
 share/luakit/lib/completion.lua
 share/luakit/lib/cookie_blocking.lua
 share/luakit/lib/cookies.lua
 share/luakit/lib/downloads.lua
 share/luakit/lib/downloads_chrome.lua
+share/luakit/lib/follow.lua
 share/luakit/lib/follow_selected.lua
 share/luakit/lib/formfiller.lua
 share/luakit/lib/go_input.lua
@@ -39,6 +28,20 @@
 share/luakit/lib/go_up.lua
 share/luakit/lib/history.lua
 share/luakit/lib/history_chrome.lua
+share/luakit/lib/introspector.lua
+share/luakit/lib/jquery.min.js
+share/luakit/lib/lousy/bind.lua
+share/luakit/lib/lousy/init.lua
+share/luakit/lib/lousy/load.lua
+share/luakit/lib/lousy/mode.lua
+share/luakit/lib/lousy/signal.lua
+share/luakit/lib/lousy/theme.lua
+share/luakit/lib/lousy/uri.lua
+share/luakit/lib/lousy/util.lua
+share/luakit/lib/lousy/widget/init.lua
+share/luakit/lib/lousy/widget/menu.lua
+share/luakit/lib/lousy/widget/tablist.lua
+share/luakit/lib/markdown.lua
 share/luakit/lib/noscript.lua
 share/luakit/lib/proxy.lua
 share/luakit/lib/quickmarks.lua
@@ -47,13 +50,11 @@
 share/luakit/lib/tabhistory.lua
 share/luakit/lib/taborder.lua
 share/luakit/lib/undoclose.lua
-share/luakit/lib/bookmarks.lua
 share/luakit/lib/userscripts.lua
-share/luakit/lib/chrome.lua
+share/luakit/lib/webinspector.lua
 share/pixmaps/luakit.png
 @dirrm share/luakit/lib/lousy/widget
 @dirrm share/luakit/lib/lousy
-@dirrm share/luakit/lib/follow
 @dirrm share/luakit/lib
 @dirrm share/luakit
 @dirrm share/doc/luakit


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Dec 15 18:30:13 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174457 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: gugabsd@mundounix.com.br
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/174457: [update] www/luakit to 2012.09.13-r1
Date: Sat, 15 Dec 2012 18:30:12 UT

 Maintainer of www/luakit,
 
 Please note that PR ports/174457 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/174457
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: pawel 
State-Changed-When: Mon Feb 18 23:03:03 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174457 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/174457: commit references a PR
Date: Mon, 18 Feb 2013 23:02:23 +0000 (UTC)

 Author: pawel
 Date: Mon Feb 18 23:02:08 2013
 New Revision: 312535
 URL: http://svnweb.freebsd.org/changeset/ports/312535
 
 Log:
   - Update to version 2012.09.13-r1
   - USE_GITHUB instead direct download
   - REINPLACE_CMD instead patches
   
   While here:
   - Make BUILD,RUN_DEPENDS path independent
   - Add dependency on devel/dbus-glib
   - Replace deprecated USE_GNOME=pkgconfig with USE_PKGCONFIG
   - Convert to OptionsNG
   - Trim Makefile header
   
   PR:		ports/174457
   Submitted by:	Green Dog <fiziologus@gmail.com>
   Approved by:	maintainer timeout
 
 Deleted:
   head/www/luakit/files/
 Modified:
   head/www/luakit/Makefile
   head/www/luakit/distinfo
   head/www/luakit/pkg-plist   (contents, props changed)
 
 Modified: head/www/luakit/Makefile
 ==============================================================================
 --- head/www/luakit/Makefile	Mon Feb 18 22:08:09 2013	(r312534)
 +++ head/www/luakit/Makefile	Mon Feb 18 23:02:08 2013	(r312535)
 @@ -1,38 +1,38 @@
 -# New ports collection makefile for:	luakit
 -# Date created:		2012-03-23
 -# Whom:			gugabsd <gugabsd@mundounix.com.br>
 -#
 +# Created by: gugabsd <gugabsd@mundounix.com.br>
  # $FreeBSD$
 -#
  
  PORTNAME=	luakit
 -PORTVERSION=	2011.07.22
 -PORTREVISION=	1
 +PORTVERSION=	2012.09.13r1
  CATEGORIES=	www
 -MASTER_SITES=	https://github.com/mason-larobina/${PORTNAME}/tarball/${PORTVERSION}-r1/
  
  MAINTAINER=	gugabsd@mundounix.com.br
  COMMENT=	Fast, small, webkit based browser framework extensible by Lua
  
  LICENSE=	GPLv3
  
 -BUILD_DEPENDS=	${LOCALBASE}/bin/help2man:${PORTSDIR}/misc/help2man
 -LIB_DEPENDS=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \
 -		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 -		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 -RUN_DEPENDS=	${LUA_MODLIBDIR}/lfs.so:${PORTSDIR}/devel/luafilesystem
 -
 -GITVERSION=	b1fb7fa
 -FETCH_ARGS=	-pRr
 -WRKSRC=		${WRKDIR}/mason-larobina-${PORTNAME}-${GITVERSION}
 +BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
 +LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 +		sqlite3:${PORTSDIR}/databases/sqlite3 \
 +		webkitgtk-1:${PORTSDIR}/www/webkit-gtk2 \
 +		unique-1:${PORTSDIR}/x11-toolkits/unique
 +RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}luafilesystem>=0:${PORTSDIR}/devel/luafilesystem
 +
 +USE_GITHUB=	yes
 +GH_ACCOUNT=	mason-larobina
 +GH_PROGECT=	${PORTNAME}
 +GH_TAGNAME=	${PORTVERSION:C/r/-r/}
 +GH_COMMIT=	0d5f4ab
  
  USE_GMAKE=	yes
 -USE_GNOME=	glib20 gtk20 pkgconfig
 -USE_LUA=	5.1+
 +USE_PKGCONFIG=	build
 +USE_GNOME=	glib20 gtk20
 +USE_LUA=	5.1
 +MAKE_ARGS+=	USE_UNIQUE=1 NO_JAVASCRIPTCORE=1
  
  MAN1=		luakit.1
  
 -OPTIONS=	LUAJIT "Use the Just-In-Time compiler for lua" off
 +OPTIONS_DEFINE=	LUAJIT
 +LUAJIT_DESC=	Use the Just-In-Time compiler for lua
  
  .include <bsd.port.options.mk>
  
 @@ -40,11 +40,11 @@ OPTIONS=	LUAJIT "Use the Just-In-Time co
  BROKEN=		Does not install on sparc64
  .endif
  
 -.if defined(WITH_LUAJIT)
 +.if ${PORT_OPTIONS:MLUAJIT}
  LIB_DEPENDS+=	luajit:${PORTSDIR}/lang/luajit
 -CONFIGURE_ARGS+=USE_LUAJIT=1
 +MAKE_ARGS+=	USE_LUAJIT=1
  .else
 -CONFIGURE_ARGS+=USE_LUAJIT=0
 +MAKE_ARGS+=	USE_LUAJIT=0
  .endif
  
  post-patch:
 @@ -52,5 +52,11 @@ post-patch:
  		-e 's|(DESTDIR)|(INSTALLDIR)|' ${WRKSRC}/Makefile
  	@${SED} -I "" 's|/etc/xdg/luakit|${LOCALBASE}&|' \
  		${WRKSRC}/lib/lousy/util.lua
 +	@${REINPLACE_CMD} -e \
 +		's|share/man|man| ; s|luakit/docs|doc/luakit| ; \
 +		/MANPREFIX */s|?=|=|' \
 +		${WRKSRC}/config.mk
 +	@${REINPLACE_CMD} -e 's|bin/env lua|&-${LUA_VER}|' \
 +		${WRKSRC}/build-utils/gentokens.lua
  
  .include <bsd.port.mk>
 
 Modified: head/www/luakit/distinfo
 ==============================================================================
 --- head/www/luakit/distinfo	Mon Feb 18 22:08:09 2013	(r312534)
 +++ head/www/luakit/distinfo	Mon Feb 18 23:02:08 2013	(r312535)
 @@ -1,2 +1,2 @@
 -SHA256 (luakit-2011.07.22.tar.gz) = 8a0d5ce7657de5dde270a691911b26822cb3259b8bf5a0fcf6c02f7748ad4a3d
 -SIZE (luakit-2011.07.22.tar.gz) = 148704
 +SHA256 (luakit-2012.09.13r1.tar.gz) = 688950fda11f032976998b52ba6505fc1bf5bba40552293f9ddc748b00f76132
 +SIZE (luakit-2012.09.13r1.tar.gz) = 215431
 
 Modified: head/www/luakit/pkg-plist
 ==============================================================================
 --- head/www/luakit/pkg-plist	Mon Feb 18 22:08:09 2013	(r312534)
 +++ head/www/luakit/pkg-plist	Mon Feb 18 23:02:08 2013	(r312535)
 @@ -1,4 +1,3 @@
 -@comment $FreeBSD$
  bin/luakit
  etc/xdg/luakit/binds.lua
  etc/xdg/luakit/globals.lua
 @@ -12,26 +11,16 @@ share/doc/luakit/README.md
  share/doc/luakit/AUTHORS
  share/doc/luakit/COPYING
  share/doc/luakit/COPYING.GPLv3
 -share/luakit/lib/lousy/widget/init.lua
 -share/luakit/lib/lousy/widget/menu.lua
 -share/luakit/lib/lousy/widget/tablist.lua
 -share/luakit/lib/lousy/init.lua
 -share/luakit/lib/lousy/mode.lua
 -share/luakit/lib/lousy/signal.lua
 -share/luakit/lib/lousy/bind.lua
 -share/luakit/lib/lousy/uri.lua
 -share/luakit/lib/lousy/util.lua
 -share/luakit/lib/lousy/theme.lua
 -share/luakit/lib/follow/binds.lua
 -share/luakit/lib/follow/init.lua
 -share/luakit/lib/follow/modes.lua
 -share/luakit/lib/follow/styles.lua
 +share/luakit/lib/bookmarks.lua
 +share/luakit/lib/bookmarks_chrome.lua
 +share/luakit/lib/chrome.lua
  share/luakit/lib/cmdhist.lua
  share/luakit/lib/completion.lua
  share/luakit/lib/cookie_blocking.lua
  share/luakit/lib/cookies.lua
  share/luakit/lib/downloads.lua
  share/luakit/lib/downloads_chrome.lua
 +share/luakit/lib/follow.lua
  share/luakit/lib/follow_selected.lua
  share/luakit/lib/formfiller.lua
  share/luakit/lib/go_input.lua
 @@ -39,6 +28,20 @@ share/luakit/lib/go_next_prev.lua
  share/luakit/lib/go_up.lua
  share/luakit/lib/history.lua
  share/luakit/lib/history_chrome.lua
 +share/luakit/lib/introspector.lua
 +share/luakit/lib/jquery.min.js
 +share/luakit/lib/lousy/bind.lua
 +share/luakit/lib/lousy/init.lua
 +share/luakit/lib/lousy/load.lua
 +share/luakit/lib/lousy/mode.lua
 +share/luakit/lib/lousy/signal.lua
 +share/luakit/lib/lousy/theme.lua
 +share/luakit/lib/lousy/uri.lua
 +share/luakit/lib/lousy/util.lua
 +share/luakit/lib/lousy/widget/init.lua
 +share/luakit/lib/lousy/widget/menu.lua
 +share/luakit/lib/lousy/widget/tablist.lua
 +share/luakit/lib/markdown.lua
  share/luakit/lib/noscript.lua
  share/luakit/lib/proxy.lua
  share/luakit/lib/quickmarks.lua
 @@ -47,13 +50,11 @@ share/luakit/lib/session.lua
  share/luakit/lib/tabhistory.lua
  share/luakit/lib/taborder.lua
  share/luakit/lib/undoclose.lua
 -share/luakit/lib/bookmarks.lua
  share/luakit/lib/userscripts.lua
 -share/luakit/lib/chrome.lua
 +share/luakit/lib/webinspector.lua
  share/pixmaps/luakit.png
  @dirrm share/luakit/lib/lousy/widget
  @dirrm share/luakit/lib/lousy
 -@dirrm share/luakit/lib/follow
  @dirrm share/luakit/lib
  @dirrm share/luakit
  @dirrm share/doc/luakit
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
