ports/174457: [update] www/luakit to 2012.09.13-r1
Green Dog
fiziologus at gmail.com
Sat Dec 15 18:30:00 UTC 2012
>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: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 15 18:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>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 at 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 @@
- at 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
- at dirrm share/luakit/lib/follow
@dirrm share/luakit/lib
@dirrm share/luakit
@dirrm share/doc/luakit
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list