svn commit: r312535 - in head/www/luakit: . files

Mon Feb 18 23:02:10 UTC 2013

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 at 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 at mundounix.com.br>
-#
+# Created by: gugabsd <gugabsd at 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 at 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 @@
- at 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
- at dirrm share/luakit/lib/follow
 @dirrm share/luakit/lib
 @dirrm share/luakit
 @dirrm share/doc/luakit
