ports/138022: Update Port: www/conkeror to the latest snapshot.

Ashish SHUKLA wahjava at gmail.com
Fri Aug 21 10:10:01 UTC 2009


>Number:         138022
>Category:       ports
>Synopsis:       Update Port: www/conkeror to the latest snapshot.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 21 10:10:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Ashish SHUKLA
>Release:        FreeBSD 8.0-BETA2 amd64
>Organization:
N/A
>Environment:
System: FreeBSD chateau.d.lf 8.0-BETA2 FreeBSD 8.0-BETA2 #0: Wed Jul 15 21:48:41 UTC 2009 root at mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64


>Description:
I would like to adopt www/conkeror port. I am attaching the diff which
will update the port to the latest git snapshot. The diff file for the
port is temporarily hosted at following URL:

http://wahjava.googlepages.com/conkeror-20090821.tar.gz

So someone needs to copy it to FreeBSD's FTP server.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/www/conkeror/Makefile conkeror/Makefile
--- /usr/ports/www/conkeror/Makefile	2008-09-07 05:48:50.000000000 +0530
+++ conkeror/Makefile	2009-08-21 15:07:54.000000000 +0530
@@ -6,30 +6,47 @@
 #
 
 PORTNAME=	conkeror
-PORTVERSION=	0.42
-PORTREVISION=	2
-DISTVERSIONPREFIX=	firefox-
+PORTVERSION=	20090821
 CATEGORIES=	www
-MASTER_SITES=	MOZDEV
-PKGNAMEPREFIX?=
+MASTER_SITES=	${MASTER_SITE_FREEBSD}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	wahjava at gmail.com
 COMMENT=	A completely keyboard driven browser based on firefox
 
-RUN_DEPENDS=	${CONK_APP}:${PORTSDIR}/www/${CONK_APP}
+WRKSRC=	${WRKDIR}/conkeror
+USE_GECKO=	libxul
 
-CONK_ARGS=	-chrome chrome://conkeror/content
-CONK_APP?=	${PKGNAMEPREFIX}firefox
-CONK_EXEC?=	${PKGNAMEPREFIX}${PORTNAME}
-USE_XPI=	${CONK_APP}
-PLIST_FILES=	bin/${CONK_EXEC}
-XPI_ID=		{a79fe89b-6662-4ff4-8e88-09950ad4dfde}
-XPI_FILES=	chrome/conkeror.jar components/nsCrank.js install.rdf chrome.manifest
-XPI_DIRS=	chrome components
+BUILD_ID=echo -n `whoami`@`hostname`_`date +%s`
+
+post-patch:
+	cd ${WRKSRC} && \
+		${REINPLACE_CMD} -e "s/%%PREFIX%%/${PREFIX:S/\//\\\//g}/g" \
+			${WRKSRC}/conkeror && \
+		${MV} debian/conkeror.desktop . && \
+		${RM} -rf debian tests && \
+		${MKDIR} share  && \
+		${MV} branding chrome components content \
+			contrib defaults locale modules search-engines help style share
+
+do-build:
+	${MAKE} -C ${WRKSRC}
+
+do-install:
+	${MKDIR} ${PREFIX}/libexec/conkeror
+	${MKDIR} ${DESKTOPDIR}
+	cd ${WRKSRC}/share && ${COPYTREE_SHARE} . ${DATADIR}
+	${SED} -e "s/BuildID=git/BuildID=$$(${BUILD_ID})/g" \
+		-e "s/^Version=\(.*\)$$/Version=\1 (FreeBSD-${OSREL})/g" \
+		<${WRKSRC}/application.ini >${DATADIR}/application.ini
+	${REINPLACE_CMD} -e "s/\\\$$CONKEROR_VERSION\\$$/`${GREP} \
+		'^Version=' ${WRKSRC}/application.ini |${SED} \
+		-e 's/^Version=//'` (FreeBSD-${OSREL})/g" ${DATADIR}/components/application.js
+	${INSTALL_SCRIPT} ${WRKSRC}/conkeror ${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/conkeror.desktop ${DESKTOPDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/conkeror-spawn-helper ${PREFIX}/libexec/conkeror/
+	${LN} -sf ${PREFIX}/libexec/conkeror/conkeror-spawn-helper ${DATADIR}/
 
 post-install:
-	@${ECHO_CMD} exec `${WHICH} ${CONK_APP}` ${CONK_ARGS} > ${PREFIX}/bin/${CONK_EXEC}
-	@${CHMOD} 555 ${PREFIX}/bin/${CONK_EXEC}
+	@-update-desktop-database
 
-.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>
diff -urN /usr/ports/www/conkeror/distinfo conkeror/distinfo
--- /usr/ports/www/conkeror/distinfo	2007-02-18 05:10:14.000000000 +0530
+++ conkeror/distinfo	2009-08-21 11:45:00.000000000 +0530
@@ -1,3 +1,3 @@
-MD5 (xpi/conkeror-firefox-0.42.xpi) = db3fd94485ced11e6a6685064a0c2e8e
-SHA256 (xpi/conkeror-firefox-0.42.xpi) = 64bd54093b96ba5897a1180d3aeb56e48a6edf9b83750c5fb5675bfdb0d272de
-SIZE (xpi/conkeror-firefox-0.42.xpi) = 62867
+MD5 (conkeror-20090821.tar.gz) = c6563dfec0802cf7e28f826edbdf953a
+SHA256 (conkeror-20090821.tar.gz) = a6e5a66ee2f8997e2d4ea769a2d6df0226e8f4c726f20535b45bc75b0098feb9
+SIZE (conkeror-20090821.tar.gz) = 238630
diff -urN /usr/ports/www/conkeror/files/patch-conkeror conkeror/files/patch-conkeror
--- /usr/ports/www/conkeror/files/patch-conkeror	1970-01-01 05:30:00.000000000 +0530
+++ conkeror/files/patch-conkeror	2009-08-21 15:14:17.000000000 +0530
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- conkeror.orig
++++ conkeror
+@@ -0,0 +1,12 @@
++#!/bin/sh
++
++XULRUNNER=$(which xulrunner)
++
++if [ -z "${XULRUNNER}" ]; then 
++	echo Unable to locate xulrunner binary.
++elif [ ! -x "${XULRUNNER}" ]; then
++	echo ${XULRUNNER} is not executable.
++else
++	exec ${XULRUNNER} /usr/local/share/conkeror/application.ini
++fi
++
diff -urN /usr/ports/www/conkeror/pkg-descr conkeror/pkg-descr
--- /usr/ports/www/conkeror/pkg-descr	2006-04-29 16:22:02.000000000 +0530
+++ conkeror/pkg-descr	2009-08-21 15:11:28.000000000 +0530
@@ -5,4 +5,4 @@
 Emacs that can be imitated by a javascript/XUL web
 browser Just Work.
 
-WWW: http://conkeror.mozdev.org/
+WWW: http://conkeror.org/
diff -urN /usr/ports/www/conkeror/pkg-plist conkeror/pkg-plist
--- /usr/ports/www/conkeror/pkg-plist	1970-01-01 05:30:00.000000000 +0530
+++ conkeror/pkg-plist	2009-08-21 15:09:04.000000000 +0530
@@ -0,0 +1,196 @@
+bin/conkeror
+libexec/conkeror/conkeror-spawn-helper
+share/applications/conkeror.desktop
+%%DATADIR%%/application.ini
+%%DATADIR%%/branding/brand.dtd
+%%DATADIR%%/branding/brand.properties
+%%DATADIR%%/chrome/chrome.manifest
+%%DATADIR%%/components/.autoreg
+%%DATADIR%%/components/application.js
+%%DATADIR%%/components/application.js.bak
+%%DATADIR%%/components/commandline.js
+%%DATADIR%%/components/download_helper.js
+%%DATADIR%%/components/download_manager_ui.js
+%%DATADIR%%/conkeror-spawn-helper
+%%DATADIR%%/content/blank.html
+%%DATADIR%%/content/conkeror.xul
+%%DATADIR%%/content/downloads.css
+%%DATADIR%%/content/help.css
+%%DATADIR%%/content/hints.css
+%%DATADIR%%/contrib/build.sh
+%%DATADIR%%/contrib/debian/nightlybuild.sh
+%%DATADIR%%/contrib/debian/update.sh
+%%DATADIR%%/contrib/install.sh
+%%DATADIR%%/contrib/man/conkeror.1
+%%DATADIR%%/contrib/mketags.sh
+%%DATADIR%%/contrib/run-conkeror
+%%DATADIR%%/contrib/testrun.sh
+%%DATADIR%%/contrib/xrev/application.ini
+%%DATADIR%%/contrib/xrev/chrome/chrome.manifest
+%%DATADIR%%/contrib/xrev/content/main.xul
+%%DATADIR%%/contrib/xrev/content/xrev.js
+%%DATADIR%%/contrib/xrev/defaults/preferences/prefs.js
+%%DATADIR%%/defaults/preferences/debug.js
+%%DATADIR%%/defaults/preferences/default-modules.js
+%%DATADIR%%/defaults/preferences/download-manager.js
+%%DATADIR%%/defaults/preferences/history-frecency.js
+%%DATADIR%%/defaults/preferences/javascript-restrictions.js
+%%DATADIR%%/defaults/preferences/prefs.js
+%%DATADIR%%/defaults/preferences/uri.js
+%%DATADIR%%/help/back-forward.html
+%%DATADIR%%/help/help.html
+%%DATADIR%%/help/manual.css
+%%DATADIR%%/help/tutorial.html
+%%DATADIR%%/locale/en-US/gui_context_menu.properties
+%%DATADIR%%/locale/en-US/netError.dtd
+%%DATADIR%%/locale/sv-SE/gui_context_menu.properties
+%%DATADIR%%/locale/sv-SE/netError.dtd
+%%DATADIR%%/modules/bindings/default/basic-commands.js
+%%DATADIR%%/modules/bindings/default/bindings.js
+%%DATADIR%%/modules/bindings/default/content-buffer/caret.js
+%%DATADIR%%/modules/bindings/default/content-buffer/checkbox.js
+%%DATADIR%%/modules/bindings/default/content-buffer/element.js
+%%DATADIR%%/modules/bindings/default/content-buffer/form.js
+%%DATADIR%%/modules/bindings/default/content-buffer/normal.js
+%%DATADIR%%/modules/bindings/default/content-buffer/quote.js
+%%DATADIR%%/modules/bindings/default/content-buffer/richedit.js
+%%DATADIR%%/modules/bindings/default/content-buffer/select.js
+%%DATADIR%%/modules/bindings/default/content-buffer/text.js
+%%DATADIR%%/modules/bindings/default/content-buffer/textarea.js
+%%DATADIR%%/modules/bindings/default/content-buffer/zoom.js
+%%DATADIR%%/modules/bindings/default/download-buffer.js
+%%DATADIR%%/modules/bindings/default/global.js
+%%DATADIR%%/modules/bindings/default/help-buffer.js
+%%DATADIR%%/modules/bindings/default/hints.js
+%%DATADIR%%/modules/bindings/default/isearch.js
+%%DATADIR%%/modules/bindings/default/minibuffer.js
+%%DATADIR%%/modules/bindings/default/universal_argument.js
+%%DATADIR%%/modules/buffer.js
+%%DATADIR%%/modules/cache.js
+%%DATADIR%%/modules/clicks-in-new-buffer.js
+%%DATADIR%%/modules/command-line.js
+%%DATADIR%%/modules/commands.js
+%%DATADIR%%/modules/conkeror.js
+%%DATADIR%%/modules/content-buffer-input.js
+%%DATADIR%%/modules/content-buffer.js
+%%DATADIR%%/modules/cookie.js
+%%DATADIR%%/modules/coroutine.js
+%%DATADIR%%/modules/daemon.js
+%%DATADIR%%/modules/debug.js
+%%DATADIR%%/modules/download-manager.js
+%%DATADIR%%/modules/element.js
+%%DATADIR%%/modules/extensions/adblockplus.js
+%%DATADIR%%/modules/extensions/dom-inspector.js
+%%DATADIR%%/modules/extensions/noscript.js
+%%DATADIR%%/modules/external-editor.js
+%%DATADIR%%/modules/eye-guide.js
+%%DATADIR%%/modules/favicon.js
+%%DATADIR%%/modules/find.js
+%%DATADIR%%/modules/follow-relationship.js
+%%DATADIR%%/modules/gitweb-webjump.js
+%%DATADIR%%/modules/global-overlay-keymap.js
+%%DATADIR%%/modules/help.js
+%%DATADIR%%/modules/hints.js
+%%DATADIR%%/modules/history.js
+%%DATADIR%%/modules/hook.js
+%%DATADIR%%/modules/interactive.js
+%%DATADIR%%/modules/io.js
+%%DATADIR%%/modules/keyboard.js
+%%DATADIR%%/modules/keywords.js
+%%DATADIR%%/modules/labels.js
+%%DATADIR%%/modules/load-spec.js
+%%DATADIR%%/modules/media.js
+%%DATADIR%%/modules/mime-type-override.js
+%%DATADIR%%/modules/mime.js
+%%DATADIR%%/modules/minibuffer-completion.js
+%%DATADIR%%/modules/minibuffer-read-file.js
+%%DATADIR%%/modules/minibuffer-read-mime-type.js
+%%DATADIR%%/modules/minibuffer-read-option.js
+%%DATADIR%%/modules/minibuffer-read.js
+%%DATADIR%%/modules/minibuffer.js
+%%DATADIR%%/modules/mode-line.js
+%%DATADIR%%/modules/mode.js
+%%DATADIR%%/modules/new-tabs.js
+%%DATADIR%%/modules/page-modes/dailymotion.js
+%%DATADIR%%/modules/page-modes/gmail.js
+%%DATADIR%%/modules/page-modes/gmane.js
+%%DATADIR%%/modules/page-modes/google-calendar.js
+%%DATADIR%%/modules/page-modes/google-images.js
+%%DATADIR%%/modules/page-modes/google-maps.js
+%%DATADIR%%/modules/page-modes/google-reader.js
+%%DATADIR%%/modules/page-modes/google-search-results.js
+%%DATADIR%%/modules/page-modes/google-video.js
+%%DATADIR%%/modules/page-modes/reddit.js
+%%DATADIR%%/modules/page-modes/wikipedia-mode.js
+%%DATADIR%%/modules/page-modes/xkcd.js
+%%DATADIR%%/modules/page-modes/youporn.js
+%%DATADIR%%/modules/page-modes/youtube.js
+%%DATADIR%%/modules/permission-manager.js
+%%DATADIR%%/modules/rc.js
+%%DATADIR%%/modules/save.js
+%%DATADIR%%/modules/scroll.js
+%%DATADIR%%/modules/search-engine.js
+%%DATADIR%%/modules/selectively-unstyle.js
+%%DATADIR%%/modules/session.js
+%%DATADIR%%/modules/spawn-process.js
+%%DATADIR%%/modules/special-buffer.js
+%%DATADIR%%/modules/ssl.js
+%%DATADIR%%/modules/suggest-file-name.js
+%%DATADIR%%/modules/tab-bar.js
+%%DATADIR%%/modules/theme.js
+%%DATADIR%%/modules/timer.js
+%%DATADIR%%/modules/universal-argument.js
+%%DATADIR%%/modules/utils.js
+%%DATADIR%%/modules/walnut.js
+%%DATADIR%%/modules/webjump.js
+%%DATADIR%%/modules/wikipedia-didyoumean.js
+%%DATADIR%%/modules/window.js
+%%DATADIR%%/modules/zoom.js
+%%DATADIR%%/search-engines/answers.xml
+%%DATADIR%%/search-engines/creativecommons.xml
+%%DATADIR%%/search-engines/eBay.xml
+%%DATADIR%%/search-engines/google.xml
+%%DATADIR%%/search-engines/mozilla-bugzilla.xml
+%%DATADIR%%/search-engines/wikipedia.xml
+%%DATADIR%%/search-engines/yahoo.xml
+%%DATADIR%%/style/default/content-buffer-input.css
+%%DATADIR%%/style/default/eye-guide.css
+%%DATADIR%%/style/default/hints--url-panel.css
+%%DATADIR%%/style/default/minibuffer.css
+%%DATADIR%%/style/default/mode-line.css
+%%DATADIR%%/style/default/new-tabs.css
+%%DATADIR%%/style/default/tab-bar.css
+%%DATADIR%%/style/default/theme.json
+%%DATADIR%%/style/window.css
+ at dirrm %%DATADIR%%/style/default
+ at dirrm %%DATADIR%%/style
+ at dirrm %%DATADIR%%/search-engines
+ at dirrm %%DATADIR%%/modules/page-modes
+ at dirrm %%DATADIR%%/modules/extensions
+ at dirrm %%DATADIR%%/modules/bindings/default/content-buffer
+ at dirrm %%DATADIR%%/modules/bindings/default
+ at dirrm %%DATADIR%%/modules/bindings
+ at dirrm %%DATADIR%%/modules
+ at dirrm %%DATADIR%%/locale/sv-SE
+ at dirrm %%DATADIR%%/locale/en-US
+ at dirrm %%DATADIR%%/locale
+ at dirrm %%DATADIR%%/help
+ at dirrm %%DATADIR%%/defaults/preferences
+ at dirrm %%DATADIR%%/defaults
+ at dirrm %%DATADIR%%/contrib/xrev/defaults/preferences
+ at dirrm %%DATADIR%%/contrib/xrev/defaults
+ at dirrm %%DATADIR%%/contrib/xrev/content
+ at dirrm %%DATADIR%%/contrib/xrev/chrome
+ at dirrm %%DATADIR%%/contrib/xrev
+ at dirrm %%DATADIR%%/contrib/man
+ at dirrm %%DATADIR%%/contrib/debian
+ at dirrm %%DATADIR%%/contrib
+ at dirrm %%DATADIR%%/content
+ at dirrm %%DATADIR%%/components
+ at dirrm %%DATADIR%%/chrome
+ at dirrm %%DATADIR%%/branding
+ at dirrm %%DATADIR%%
+ at dirrm libexec/conkeror
+ at dirrmtry share/applications
+ at exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+ at unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list