Date: Sun, 17 Nov 2013 01:22:45 -0400 From: Joseph Mingrone <jrm@ftfl.ca> To: FreeBSD-gnats-submit@FreeBSD.org Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/183646: Update www/xpi-conkeror to conkerror-20131026, add staging, other updates Message-ID: <86bo1job4q.fsf@gly.ath.cx> In-Reply-To: <201311040440.rA44e0e7049021@freefall.freebsd.org> (FreeBSD-gnats-submit@freebsd.org's message of "Mon, 4 Nov 2013 04:40:00 GMT") References: <201311040440.rA44e0e7049021@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-= Content-Type: text/plain There is a new tarball (which should be on the FreeBSD mirrors soon) with some of our patches accepted by the Conkeror project. Please ignore the last svn diff and use the one attached here. Joseph --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=xpi-conkeror.diff Content-Description: www/xpi-conkeror patch Index: Makefile =================================================================== --- Makefile (revision 334056) +++ Makefile (working copy) @@ -2,52 +2,76 @@ # $FreeBSD$ PORTNAME= conkeror -PORTVERSION= 20090821 -PORTREVISION= 6 +PORTVERSION= 20131117 CATEGORIES= www -MASTER_SITES= http://mirror.4bit.ws/ \ - ${MASTER_SITE_LOCAL} \ - ${MASTER_SITE_FREEBSD} +MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= dhn MAINTAINER= ashish@FreeBSD.org -COMMENT= A completely keyboard driven browser based on firefox +COMMENT= Keyboard-oriented, customizable web browser based on Mozilla XULRunner -WRKSRC= ${WRKDIR}/conkeror -USE_GECKO= libxul +LICENSE= GPLv1 GPLv2 MPL +LICENSE_COMB= multi -BUILD_ID=echo -n `whoami`@`hostname`_`date +%s` +USE_XZ= yes -NO_STAGE= yes +OPTIONS_SINGLE+= XULRUNNER +OPTIONS_SINGLE_XULRUNNER= FIREFOX LIBXUL +FIREFOX_DESC?= Use XULRunner from Firefox port +LIBXUL_DESC?= Use XULRunner from LibXUL port +OPTIONS_DEFAULT+= LIBXUL + +WRKSRC= ${WRKDIR}/conkeror + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MLIBXUL} +USE_GECKO=libxul +.else +USE_FIREFOX=25 +.endif + +USES= desktop-file-utils + +BUILD_ID= @{ECHO_CMD} -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 + cd ${WRKSRC} && \ + ${MV} debian/conkeror.desktop . && \ + ${MV} contrib/man/conkeror.1 . && \ + ${RM} -rf contrib/debian contrib/man debian tests && \ + ${RM} -f contrib/build.sh contrib/install.sh contrib/mketags.sh \ + contrib/testrun.sh contrib/run-conkeror && \ + ${MKDIR} share && \ + ${MV} branding chrome components content \ + contrib defaults locale modules search-engines help \ + style share && \ + ${MV} COPYING CREDITS Info.plist chrome.manifest \ + content-policy.manifest share +.if ${PORT_OPTIONS:MFIREFOX} + ${REINPLACE_CMD} -e "s/xulrunner/firefox/g" ${WRKSRC}/conkeror + ${REINPLACE_CMD} -e "s/XULRUNNER/FIREFOX/g" ${WRKSRC}/conkeror + ${REINPLACE_CMD} -e 's/exec $${FIREFOX}/exec $${FIREFOX} -app/' ${WRKSRC}/conkeror +.endif do-build: - ${MAKE} -C ${WRKSRC} + ${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}/ + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/conkeror + ${MKDIR} ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${DESKTOPDIR} + cd ${WRKSRC}/share && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} + ${SED} -e "s/BuildID=git/BuildID=$$(${BUILD_ID})/g" \ + -e "s/^Version=\(.*\)$$/Version=\1 (FreeBSD-${OSREL})/g" \ + <${WRKSRC}/application.ini >${STAGEDIR}${DATADIR}/application.ini + ${INSTALL_SCRIPT} ${WRKSRC}/conkeror ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKSRC}/conkeror.desktop ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/conkeror-spawn-helper ${STAGEDIR}${PREFIX}/libexec/conkeror/ + ${LN} -sf ${PREFIX}/libexec/conkeror/conkeror-spawn-helper ${STAGEDIR}${DATADIR}/ + ${INSTALL_MAN} ${WRKSRC}/conkeror.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 post-install: - @-update-desktop-database + @-update-desktop-database .include <bsd.port.mk> Index: distinfo =================================================================== --- distinfo (revision 334056) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (conkeror-20090821.tar.gz) = a6e5a66ee2f8997e2d4ea769a2d6df0226e8f4c726f20535b45bc75b0098feb9 -SIZE (conkeror-20090821.tar.gz) = 238630 +SHA256 (conkeror-20131117.tar.xz) = 8d2fca65ec22b58d49305fd44553c4bfded7501154fc39b2d30348db05f12c72 +SIZE (conkeror-20131117.tar.xz) = 229356 Index: files/chrome.manifest =================================================================== --- files/chrome.manifest (revision 334056) +++ files/chrome.manifest (working copy) @@ -1,2 +0,0 @@ - -content conkeror jar:chrome/conkeror.jar!/conkeror/content/ Index: files/patch-conkeror =================================================================== --- files/patch-conkeror (revision 334056) +++ files/patch-conkeror (working copy) @@ -13,6 +13,6 @@ +elif [ ! -x "${XULRUNNER}" ]; then + echo ${XULRUNNER} is not executable. +else -+ exec ${XULRUNNER} /usr/local/share/conkeror/application.ini ++ exec ${XULRUNNER} /usr/local/share/conkeror/application.ini "$@" +fi + Index: files/patch-conkeror--spawn--helper.c =================================================================== --- files/patch-conkeror--spawn--helper.c (revision 0) +++ files/patch-conkeror--spawn--helper.c (working copy) @@ -0,0 +1,10 @@ +--- conkeror/conkeror-spawn-helper.c.orig 2013-08-16 13:08:22.000000000 -0300 ++++ conkeror-spawn-helper.c 2013-11-03 22:48:41.000000000 -0400 +@@ -5,6 +5,7 @@ + * COPYING file. + **/ + ++#include <arpa/inet.h> + #include <sys/types.h> + #include <sys/socket.h> + #include <unistd.h> Property changes on: files/patch-conkeror--spawn--helper.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: pkg-descr =================================================================== --- pkg-descr (revision 334056) +++ pkg-descr (working copy) @@ -1,8 +1,8 @@ -Conkeror is a mozilla based web browser designed to be -completely keyboard driven, no compromises. It also -strives to behave as much like Emacs as possible. This -means all the keybindings and to-die-for features of -Emacs that can be imitated by a javascript/XUL web -browser Just Work. +Conkeror is a keyboard-oriented, highly-customizable, highly-extensible web +browser based on Mozilla XULRunner, written mainly in JavaScript, and inspired +by exceptional software such as Emacs and vi. Conkeror features a sophisticated +keyboard system, allowing users to run commands and interact with content in +powerful and novel ways. It is self-documenting, featuring a powerful +interactive help system. WWW: http://conkeror.org/ Index: pkg-plist =================================================================== --- pkg-plist (revision 334056) +++ pkg-plist (working copy) @@ -1,32 +1,42 @@ bin/conkeror libexec/conkeror/conkeror-spawn-helper +man/man1/conkeror.1.gz share/applications/conkeror.desktop +%%DATADIR%%/COPYING +%%DATADIR%%/CREDITS +%%DATADIR%%/Info.plist +%%DATADIR%%/chrome.manifest +%%DATADIR%%/content-policy.manifest %%DATADIR%%/application.ini %%DATADIR%%/branding/brand.dtd %%DATADIR%%/branding/brand.properties +%%DATADIR%%/branding/content/about.png %%DATADIR%%/chrome/chrome.manifest %%DATADIR%%/components/.autoreg %%DATADIR%%/components/application.js -%%DATADIR%%/components/application.js.bak -%%DATADIR%%/components/commandline.js +%%DATADIR%%/components/command-line.js +%%DATADIR%%/components/content-policy.js %%DATADIR%%/components/download_helper.js %%DATADIR%%/components/download_manager_ui.js %%DATADIR%%/conkeror-spawn-helper +%%DATADIR%%/content/annotated-textbox.xml %%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%%/content/minibuffer-annotation.css +%%DATADIR%%/content/minibuffer.css +%%DATADIR%%/content/minibuffer.xul +%%DATADIR%%/contrib/art/conker.svg +%%DATADIR%%/contrib/art/nut.svg +%%DATADIR%%/contrib/art/outline.svg +%%DATADIR%%/contrib/config/common.js +%%DATADIR%%/contrib/list-xulrunner-versions +%%DATADIR%%/contrib/modules/mode-line-buttons.js %%DATADIR%%/contrib/xrev/application.ini %%DATADIR%%/contrib/xrev/chrome/chrome.manifest +%%DATADIR%%/contrib/xrev/chrome.manifest %%DATADIR%%/contrib/xrev/content/main.xul %%DATADIR%%/contrib/xrev/content/xrev.js %%DATADIR%%/contrib/xrev/defaults/preferences/prefs.js @@ -33,6 +43,7 @@ %%DATADIR%%/defaults/preferences/debug.js %%DATADIR%%/defaults/preferences/default-modules.js %%DATADIR%%/defaults/preferences/download-manager.js +%%DATADIR%%/defaults/preferences/gui.js %%DATADIR%%/defaults/preferences/history-frecency.js %%DATADIR%%/defaults/preferences/javascript-restrictions.js %%DATADIR%%/defaults/preferences/prefs.js @@ -42,17 +53,20 @@ %%DATADIR%%/help/manual.css %%DATADIR%%/help/tutorial.html %%DATADIR%%/locale/en-US/gui_context_menu.properties -%%DATADIR%%/locale/en-US/netError.dtd +%%DATADIR%%/locale/en-US/netErrorApp.dtd %%DATADIR%%/locale/sv-SE/gui_context_menu.properties -%%DATADIR%%/locale/sv-SE/netError.dtd +%%DATADIR%%/locale/sv-SE/netErrorApp.dtd +%%DATADIR%%/modules/array.js %%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/caret.js +%%DATADIR%%/modules/bindings/default/content-buffer/anchor.js +%%DATADIR%%/modules/bindings/default/content-buffer/button.js %%DATADIR%%/modules/bindings/default/content-buffer/checkbox.js %%DATADIR%%/modules/bindings/default/content-buffer/element.js +%%DATADIR%%/modules/bindings/default/content-buffer/embed.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 @@ -59,46 +73,63 @@ %%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/formfill.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/bindings/default/quote.js +%%DATADIR%%/modules/bindings/default/special-buffer.js +%%DATADIR%%/modules/bindings/default/text.js +%%DATADIR%%/modules/bindings/default/universal-argument.js +%%DATADIR%%/modules/block-content-focus-change.js %%DATADIR%%/modules/buffer.js +%%DATADIR%%/modules/builtin-commands.js %%DATADIR%%/modules/cache.js +%%DATADIR%%/modules/caret.js +%%DATADIR%%/modules/casual-spelling.jsx %%DATADIR%%/modules/clicks-in-new-buffer.js +%%DATADIR%%/modules/client-redirect.jsx %%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/content-handler.js +%%DATADIR%%/modules/content-policy.js %%DATADIR%%/modules/cookie.js %%DATADIR%%/modules/coroutine.js %%DATADIR%%/modules/daemon.js %%DATADIR%%/modules/debug.js +%%DATADIR%%/modules/dom.js %%DATADIR%%/modules/download-manager.js %%DATADIR%%/modules/element.js +%%DATADIR%%/modules/env.js %%DATADIR%%/modules/extensions/adblockplus.js %%DATADIR%%/modules/extensions/dom-inspector.js %%DATADIR%%/modules/extensions/noscript.js +%%DATADIR%%/modules/extensions/venkman.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/formfill.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/index-webjump.js +%%DATADIR%%/modules/input.js %%DATADIR%%/modules/interactive.js %%DATADIR%%/modules/io.js -%%DATADIR%%/modules/keyboard.js +%%DATADIR%%/modules/isearch.js +%%DATADIR%%/modules/keymap.js %%DATADIR%%/modules/keywords.js %%DATADIR%%/modules/labels.js %%DATADIR%%/modules/load-spec.js +%%DATADIR%%/modules/login.js %%DATADIR%%/modules/media.js %%DATADIR%%/modules/mime-type-override.js %%DATADIR%%/modules/mime.js @@ -111,58 +142,88 @@ %%DATADIR%%/modules/mode-line.js %%DATADIR%%/modules/mode.js %%DATADIR%%/modules/new-tabs.js +%%DATADIR%%/modules/opensearch.js %%DATADIR%%/modules/page-modes/dailymotion.js +%%DATADIR%%/modules/page-modes/duckduckgo.js +%%DATADIR%%/modules/page-modes/facebook.js +%%DATADIR%%/modules/page-modes/feedly.js +%%DATADIR%%/modules/page-modes/github.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-gqueues.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/google-voice.js +%%DATADIR%%/modules/page-modes/grooveshark.js +%%DATADIR%%/modules/page-modes/key-kill.js +%%DATADIR%%/modules/page-modes/newsblur.js %%DATADIR%%/modules/page-modes/reddit.js -%%DATADIR%%/modules/page-modes/wikipedia-mode.js +%%DATADIR%%/modules/page-modes/smbc.js +%%DATADIR%%/modules/page-modes/stackexchange.js +%%DATADIR%%/modules/page-modes/twitter.js +%%DATADIR%%/modules/page-modes/wikipedia.js %%DATADIR%%/modules/page-modes/xkcd.js -%%DATADIR%%/modules/page-modes/youporn.js +%%DATADIR%%/modules/page-modes/youtube-player.js %%DATADIR%%/modules/page-modes/youtube.js %%DATADIR%%/modules/permission-manager.js +%%DATADIR%%/modules/pref.js +%%DATADIR%%/modules/pretty-print.js +%%DATADIR%%/modules/quote.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/services.js %%DATADIR%%/modules/session.js +%%DATADIR%%/modules/source-code.js %%DATADIR%%/modules/spawn-process.js %%DATADIR%%/modules/special-buffer.js %%DATADIR%%/modules/ssl.js +%%DATADIR%%/modules/string.js +%%DATADIR%%/modules/stylesheet.js %%DATADIR%%/modules/suggest-file-name.js %%DATADIR%%/modules/tab-bar.js +%%DATADIR%%/modules/text.js %%DATADIR%%/modules/theme.js %%DATADIR%%/modules/timer.js %%DATADIR%%/modules/universal-argument.js +%%DATADIR%%/modules/user-agent.js +%%DATADIR%%/modules/user-variable.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/duckduckgo.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/wiktionary.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 +%%DATADIR%%/style/default/window--panel.css +%%DATADIR%%/style/gesso/mode-line--gesso.css +%%DATADIR%%/style/gesso/new-tabs--gesso.css +%%DATADIR%%/style/gesso/tab-bar--gesso.css +%%DATADIR%%/style/gesso/theme.json +%%DATADIR%%/style/mono/conkeror--mono.css +%%DATADIR%%/style/mono/theme.json @dirrm %%DATADIR%%/style/default +@dirrm %%DATADIR%%/style/gesso +@dirrm %%DATADIR%%/style/mono @dirrm %%DATADIR%%/style @dirrm %%DATADIR%%/search-engines @dirrm %%DATADIR%%/modules/page-modes @@ -177,17 +238,19 @@ @dirrm %%DATADIR%%/help @dirrm %%DATADIR%%/defaults/preferences @dirrm %%DATADIR%%/defaults +@dirrm %%DATADIR%%/contrib/art +@dirrm %%DATADIR%%/contrib/config +@dirrm %%DATADIR%%/contrib/modules @dirrm %%DATADIR%%/contrib/xrev/defaults/preferences @dirrm %%DATADIR%%/contrib/xrev/defaults @dirrm %%DATADIR%%/contrib/xrev/content @dirrm %%DATADIR%%/contrib/xrev/chrome @dirrm %%DATADIR%%/contrib/xrev -@dirrm %%DATADIR%%/contrib/man -@dirrm %%DATADIR%%/contrib/debian @dirrm %%DATADIR%%/contrib @dirrm %%DATADIR%%/content @dirrm %%DATADIR%%/components @dirrm %%DATADIR%%/chrome +@dirrm %%DATADIR%%/branding/content @dirrm %%DATADIR%%/branding @dirrm %%DATADIR%% @dirrm libexec/conkeror --=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86bo1job4q.fsf>