Free spot for current Conkeror that is based on XULrunner. So the new Conkeror can depend on either www/libxul or www/firefox3.
Responsible Changed From-To: freebsd-ports-bugs->miwi I'll take it.
State Changed From-To: open->feedback could you me send a patch to update this port after the repocopy?
miwi@FreeBSD.org writes: > could you me send a patch to update this port after the repocopy? Well, if you don't mind untested WIP port. It works for me but installation procedure is ugly, i.e. the port just dumps entire WRKSRC into DATADIR. --- conkeror.diff begins here --- Index: www/conkeror/Makefile =================================================================== RCS file: /home/csup/ports/www/conkeror/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- www/conkeror/Makefile 7 Sep 2008 00:18:50 -0000 1.13 +++ www/conkeror/Makefile 3 Jul 2009 06:41:24 -0000 @@ -6,30 +6,68 @@ # PORTNAME= conkeror -PORTVERSION= 0.42 -PORTREVISION= 2 -DISTVERSIONPREFIX= firefox- +PORTVERSION= 0.9.${SNAPDATE} +DISTVERSIONSUFFIX=.${SNAPREV} CATEGORIES= www -MASTER_SITES= MOZDEV -PKGNAMEPREFIX?= +MASTER_SITES= ftp://ftp.lissyara.su/users/Guest/distfiles/ MAINTAINER= ports@FreeBSD.org -COMMENT= A completely keyboard driven browser based on firefox +COMMENT= A completely keyboard driven browser based on XULrunner -RUN_DEPENDS= ${CONK_APP}:${PORTSDIR}/www/${CONK_APP} +USE_BZIP2= yes +ALL_TARGET= # empty -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 - -post-install: - @${ECHO_CMD} exec `${WHICH} ${CONK_APP}` ${CONK_ARGS} > ${PREFIX}/bin/${CONK_EXEC} - @${CHMOD} 555 ${PREFIX}/bin/${CONK_EXEC} +PLIST_FILES= bin/${PORTNAME} +MAN1= ${PORTNAME}.1 +PORTDATA= * +SUB_FILES= ${PORTNAME} -.include "${.CURDIR}/../xpi-adblock/Makefile.xpi" -.include <bsd.port.mk> +SNAPDATE= 20090630 +SNAPREV= f8bf1c1 + +OPTIONS= XULRUNNER "Use xulrunner 1.9.0 (www/libxul)" on \ + FIREFOX3 "Use firefox 3.0 (www/firefox3)" off \ + FIREFOX35 "Use firefox 3.5 (www/firefox35)" off + +.include <bsd.port.pre.mk> + +.if (defined(WITH_XULRUNNER) && (defined(WITH_FIREFOX3) \ + || defined(WITH_FIREFOX35))) \ + || (defined(WITH_FIREFOX3) && defined(WITH_FIREFOX35)) +IGNORE= only one backend can be specified +.elif defined(WITH_XULRUNNER) +RUN_DEPENDS= ${LOCALBASE}/bin/xulrunner:${PORTSDIR}/www/libxul +SUB_LIST+= BACKEND=xulrunner +.elif defined(WITH_FIREFOX3) +RUN_DEPENDS= ${LOCALBASE}/bin/firefox3:${PORTSDIR}/www/firefox3 +SUB_LIST+= BACKEND=firefox3 +.elif defined(WITH_FIREFOX35) +RUN_DEPENDS= ${LOCALBASE}/bin/firefox3:${PORTSDIR}/www/firefox35 +SUB_LIST+= BACKEND=firefox3 +.else +IGNORE= no backends specified +.endif + +do-install: + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/contrib/man/${PORTNAME}.1 ${MAN1PREFIX}/man/man1 + ${MKDIR} ${DATADIR} + ${TAR} cf - -C${WRKSRC} . | ${TAR} xf - -C${DATADIR} + +GIT_WORK= ${WRKDIR}/${PORTNAME}.git-clone +GIT_REV= $$(date -ur$$(git log --pretty=format:%ct -1 \ + ) +%Y%m%d).$$(git log --pretty=format:%h -1) + +maint-gen-distfile: + git clone git://repo.or.cz/conkeror.git ${GIT_WORK} + + ( cd ${GIT_WORK}; \ + git log --stat >ChangeLog; \ + ${TAR} cjf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME:S/${SNAPDATE}.${SNAPREV}$$//}${GIT_REV}.tar.bz2 \ + --exclude '.git*' \ + -s "|${GIT_WORK}|${DISTNAME:S/${SNAPDATE}.${SNAPREV}$$//}${GIT_REV}|" \ + ${GIT_WORK} ) + + ${RM} -rf ${GIT_WORK} + +.include <bsd.port.post.mk> Index: www/conkeror/distinfo =================================================================== RCS file: /home/csup/ports/www/conkeror/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- www/conkeror/distinfo 17 Feb 2007 23:40:14 -0000 1.8 +++ www/conkeror/distinfo 3 Jul 2009 03:36:54 -0000 @@ -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-0.9.20090630.f8bf1c1.tar.bz2) = 3c685d87565ba800e55630eac84fbf18 +SHA256 (conkeror-0.9.20090630.f8bf1c1.tar.bz2) = 5d6b8c2e76e058227482431ebdda139ce8bc34a7826ea42bc5a18e1c26722746 +SIZE (conkeror-0.9.20090630.f8bf1c1.tar.bz2) = 308022 Index: www/conkeror/pkg-descr =================================================================== RCS file: /home/csup/ports/www/conkeror/pkg-descr,v retrieving revision 1.1 diff -u -p -r1.1 pkg-descr --- www/conkeror/pkg-descr 29 Apr 2006 10:52:02 -0000 1.1 +++ www/conkeror/pkg-descr 3 Jul 2009 03:49:47 -0000 @@ -5,4 +5,4 @@ means all the keybindings and to-die-for Emacs that can be imitated by a javascript/XUL web browser Just Work. -WWW: http://conkeror.mozdev.org/ +WWW: http://conkeror.org/ Index: www/conkeror/files/chrome.manifest =================================================================== RCS file: www/conkeror/files/chrome.manifest diff -N www/conkeror/files/chrome.manifest --- www/conkeror/files/chrome.manifest 29 Apr 2006 10:52:03 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ - -content conkeror jar:chrome/conkeror.jar!/conkeror/content/ Index: www/conkeror/files/conkeror.in =================================================================== RCS file: www/conkeror/files/conkeror.in diff -N www/conkeror/files/conkeror.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/conkeror/files/conkeror.in 3 Jul 2009 06:49:29 -0000 @@ -0,0 +1,3 @@ +#! /bin/sh + +exec %%BACKEND%% --app %%DATADIR%%/application.ini "$@" Index: www/conkeror/files/patch-Makefile =================================================================== RCS file: www/conkeror/files/patch-Makefile diff -N www/conkeror/files/patch-Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/conkeror/files/patch-Makefile 3 Jul 2009 04:19:38 -0000 @@ -0,0 +1,10 @@ +--- Makefile ++++ Makefile +@@ -1,7 +1,5 @@ + .PHONY: clean + +-CFLAGS = -O2 -g +- + conkeror-spawn-helper: conkeror-spawn-helper.c + + clean: --- conkeror.diff ends here --- --- plist begins here --- $ pkg_info -xL conkeror Information for conkeror-0.9.20090630: Files: /usr/local/bin/conkeror /usr/local/man/man1/conkeror.1.gz /usr/local/share/conkeror/COPYING /usr/local/share/conkeror/CREDITS /usr/local/share/conkeror/ChangeLog /usr/local/share/conkeror/INSTALL /usr/local/share/conkeror/Info.plist /usr/local/share/conkeror/Makefile /usr/local/share/conkeror/Makefile.orig /usr/local/share/conkeror/application.ini /usr/local/share/conkeror/branding/brand.dtd /usr/local/share/conkeror/branding/brand.properties /usr/local/share/conkeror/chrome/chrome.manifest /usr/local/share/conkeror/components/download_helper.js /usr/local/share/conkeror/components/commandline.js /usr/local/share/conkeror/components/application.js /usr/local/share/conkeror/components/download_manager_ui.js /usr/local/share/conkeror/components/.autoreg /usr/local/share/conkeror/conkeror-spawn-helper /usr/local/share/conkeror/conkeror-spawn-helper.c /usr/local/share/conkeror/content/blank.html /usr/local/share/conkeror/content/hints.css /usr/local/share/conkeror/content/conkeror.xul /usr/local/share/conkeror/content/help.css /usr/local/share/conkeror/content/downloads.css /usr/local/share/conkeror/contrib/run-conkeror /usr/local/share/conkeror/contrib/debian/nightlybuild.sh /usr/local/share/conkeror/contrib/debian/update.sh /usr/local/share/conkeror/contrib/testrun.sh /usr/local/share/conkeror/contrib/mketags.sh /usr/local/share/conkeror/contrib/install.sh /usr/local/share/conkeror/contrib/xrev/content/main.xul /usr/local/share/conkeror/contrib/xrev/content/xrev.js /usr/local/share/conkeror/contrib/xrev/chrome/chrome.manifest /usr/local/share/conkeror/contrib/xrev/defaults/preferences/prefs.js /usr/local/share/conkeror/contrib/xrev/application.ini /usr/local/share/conkeror/contrib/man/conkeror.1 /usr/local/share/conkeror/contrib/build.sh /usr/local/share/conkeror/debian/watch /usr/local/share/conkeror/debian/control /usr/local/share/conkeror/debian/changelog /usr/local/share/conkeror/debian/compat /usr/local/share/conkeror/debian/conkeror.manpages /usr/local/share/conkeror/debian/NEWS.Debian /usr/local/share/conkeror/debian/conkeror.menu /usr/local/share/conkeror/debian/conkeror.dirs /usr/local/share/conkeror/debian/conkeror.bin /usr/local/share/conkeror/debian/conkeror-spawn-process-helper.docs /usr/local/share/conkeror/debian/CREDITS.Debian /usr/local/share/conkeror/debian/copyright /usr/local/share/conkeror/debian/README.source /usr/local/share/conkeror/debian/patches/sensible-editor.diff /usr/local/share/conkeror/debian/patches/series /usr/local/share/conkeror/debian/rules /usr/local/share/conkeror/debian/conkeror-spawn-process-helper.dirs /usr/local/share/conkeror/debian/conkeror.docs /usr/local/share/conkeror/debian/conkeror.prerm /usr/local/share/conkeror/debian/MPL /usr/local/share/conkeror/debian/README.Debian /usr/local/share/conkeror/debian/conkeror.desktop /usr/local/share/conkeror/debian/conkeror.postinst /usr/local/share/conkeror/defaults/preferences/history-frecency.js /usr/local/share/conkeror/defaults/preferences/download-manager.js /usr/local/share/conkeror/defaults/preferences/uri.js /usr/local/share/conkeror/defaults/preferences/prefs.js /usr/local/share/conkeror/defaults/preferences/javascript-restrictions.js /usr/local/share/conkeror/defaults/preferences/debug.js /usr/local/share/conkeror/defaults/preferences/default-modules.js /usr/local/share/conkeror/help/back-forward.html /usr/local/share/conkeror/help/help.html /usr/local/share/conkeror/help/tutorial.html /usr/local/share/conkeror/help/manual.css /usr/local/share/conkeror/locale/en-US/gui_context_menu.properties /usr/local/share/conkeror/locale/en-US/netError.dtd /usr/local/share/conkeror/locale/sv-SE/netError.dtd /usr/local/share/conkeror/locale/sv-SE/gui_context_menu.properties /usr/local/share/conkeror/modules/history.js /usr/local/share/conkeror/modules/eye-guide.js /usr/local/share/conkeror/modules/clicks-in-new-buffer.js /usr/local/share/conkeror/modules/utils.js /usr/local/share/conkeror/modules/load-spec.js /usr/local/share/conkeror/modules/media.js /usr/local/share/conkeror/modules/favicon.js /usr/local/share/conkeror/modules/ssl.js /usr/local/share/conkeror/modules/mode-line.js /usr/local/share/conkeror/modules/theme.js /usr/local/share/conkeror/modules/rc.js /usr/local/share/conkeror/modules/bindings/default/basic-commands.js /usr/local/share/conkeror/modules/bindings/default/hints.js /usr/local/share/conkeror/modules/bindings/default/global.js /usr/local/share/conkeror/modules/bindings/default/isearch.js /usr/local/share/conkeror/modules/bindings/default/content-buffer/caret.js /usr/local/share/conkeror/modules/bindings/default/content-buffer/form.js /usr/local/share/conkeror/modules/bindings/default/content-buffer/quote.js /usr/local/share/conkeror/modules/bindings/default/content-buffer/text.js /usr/local/share/conkeror/modules/bindings/default/content-buffer/textarea.js /usr/local/share/conkeror/modules/bindings/default/content-buffer/element.js /usr/local/share/conkeror/modules/bindings/default/content-buffer/select.js /usr/local/share/conkeror/modules/bindings/default/content-buffer/checkbox.js /usr/local/share/conkeror/modules/bindings/default/content-buffer/normal.js /usr/local/share/conkeror/modules/bindings/default/content-buffer/richedit.js /usr/local/share/conkeror/modules/bindings/default/content-buffer/zoom.js /usr/local/share/conkeror/modules/bindings/default/bindings.js /usr/local/share/conkeror/modules/bindings/default/help-buffer.js /usr/local/share/conkeror/modules/bindings/default/minibuffer.js /usr/local/share/conkeror/modules/bindings/default/download-buffer.js /usr/local/share/conkeror/modules/bindings/default/universal_argument.js /usr/local/share/conkeror/modules/universal-argument.js /usr/local/share/conkeror/modules/mime-type-override.js /usr/local/share/conkeror/modules/minibuffer-read.js /usr/local/share/conkeror/modules/search-engine.js /usr/local/share/conkeror/modules/interactive.js /usr/local/share/conkeror/modules/hook.js /usr/local/share/conkeror/modules/extensions/adblockplus.js /usr/local/share/conkeror/modules/extensions/dom-inspector.js /usr/local/share/conkeror/modules/extensions/noscript.js /usr/local/share/conkeror/modules/find.js /usr/local/share/conkeror/modules/webjump.js /usr/local/share/conkeror/modules/element.js /usr/local/share/conkeror/modules/labels.js /usr/local/share/conkeror/modules/scroll.js /usr/local/share/conkeror/modules/hints.js /usr/local/share/conkeror/modules/selectively-unstyle.js /usr/local/share/conkeror/modules/buffer.js /usr/local/share/conkeror/modules/mime.js /usr/local/share/conkeror/modules/minibuffer-read-option.js /usr/local/share/conkeror/modules/timer.js /usr/local/share/conkeror/modules/commands.js /usr/local/share/conkeror/modules/permission-manager.js /usr/local/share/conkeror/modules/follow-relationship.js /usr/local/share/conkeror/modules/content-buffer-input.js /usr/local/share/conkeror/modules/cookie.js /usr/local/share/conkeror/modules/gitweb-webjump.js /usr/local/share/conkeror/modules/minibuffer-read-file.js /usr/local/share/conkeror/modules/spawn-process.js /usr/local/share/conkeror/modules/mode.js /usr/local/share/conkeror/modules/page-modes/xkcd.js /usr/local/share/conkeror/modules/page-modes/google-search-results.js /usr/local/share/conkeror/modules/page-modes/gmail.js /usr/local/share/conkeror/modules/page-modes/google-images.js /usr/local/share/conkeror/modules/page-modes/dailymotion.js /usr/local/share/conkeror/modules/page-modes/reddit.js /usr/local/share/conkeror/modules/page-modes/youtube.js /usr/local/share/conkeror/modules/page-modes/google-calendar.js /usr/local/share/conkeror/modules/page-modes/gmane.js /usr/local/share/conkeror/modules/page-modes/google-video.js /usr/local/share/conkeror/modules/page-modes/google-reader.js /usr/local/share/conkeror/modules/page-modes/youporn.js /usr/local/share/conkeror/modules/page-modes/google-maps.js /usr/local/share/conkeror/modules/window.js /usr/local/share/conkeror/modules/keywords.js /usr/local/share/conkeror/modules/io.js /usr/local/share/conkeror/modules/external-editor.js /usr/local/share/conkeror/modules/daemon.js /usr/local/share/conkeror/modules/zoom.js /usr/local/share/conkeror/modules/new-tabs.js /usr/local/share/conkeror/modules/help.js /usr/local/share/conkeror/modules/content-buffer.js /usr/local/share/conkeror/modules/special-buffer.js /usr/local/share/conkeror/modules/suggest-file-name.js /usr/local/share/conkeror/modules/coroutine.js /usr/local/share/conkeror/modules/keyboard.js /usr/local/share/conkeror/modules/save.js /usr/local/share/conkeror/modules/debug.js /usr/local/share/conkeror/modules/wikipedia-webjumps.js /usr/local/share/conkeror/modules/wikipedia-didyoumean.js /usr/local/share/conkeror/modules/minibuffer.js /usr/local/share/conkeror/modules/walnut.js /usr/local/share/conkeror/modules/minibuffer-read-mime-type.js /usr/local/share/conkeror/modules/command-line.js /usr/local/share/conkeror/modules/tab-bar.js /usr/local/share/conkeror/modules/minibuffer-completion.js /usr/local/share/conkeror/modules/session.js /usr/local/share/conkeror/modules/conkeror.js /usr/local/share/conkeror/modules/cache.js /usr/local/share/conkeror/modules/download-manager.js /usr/local/share/conkeror/modules/global-overlay-keymap.js /usr/local/share/conkeror/search-engines/yahoo.xml /usr/local/share/conkeror/search-engines/mozilla-bugzilla.xml /usr/local/share/conkeror/search-engines/eBay.xml /usr/local/share/conkeror/search-engines/wikipedia.xml /usr/local/share/conkeror/search-engines/creativecommons.xml /usr/local/share/conkeror/search-engines/answers.xml /usr/local/share/conkeror/search-engines/google.xml /usr/local/share/conkeror/style/window.css /usr/local/share/conkeror/style/default/minibuffer.css /usr/local/share/conkeror/style/default/new-tabs.css /usr/local/share/conkeror/style/default/tab-bar.css /usr/local/share/conkeror/style/default/eye-guide.css /usr/local/share/conkeror/style/default/theme.json /usr/local/share/conkeror/style/default/hints--url-panel.css /usr/local/share/conkeror/style/default/content-buffer-input.css /usr/local/share/conkeror/style/default/mode-line.css /usr/local/share/conkeror/tests/simple/walnut.js /usr/local/share/conkeror/tests/simple/webjump.js /usr/local/share/conkeror/tests/simple/uri.js /usr/local/share/conkeror/tests/simple/modules.js /usr/local/share/conkeror/tests/simple/theme.js /usr/local/share/conkeror/tests/simple/external-filename.js /usr/local/share/conkeror/tests/simple/utils.js /usr/local/share/conkeror/tests/simple/interactive.js /usr/local/share/conkeror/tests/simple/keymap.js /usr/local/share/conkeror/tests/shell-nix/commandline.sh --- plist ends here ---
Responsible Changed From-To: miwi->dhn dennis like to take this
State Changed From-To: feedback->open got feedback
State Changed From-To: open->repocopy please repocopy to www/conkeror -> www/xpi-conkeror
Responsible Changed From-To: dhn->portmgr over to portmgr :)
State Changed From-To: repocopy->open Repocopy complete.
Responsible Changed From-To: portmgr->dhn Repocopy complete.
dhn 2009-09-05 15:46:18 UTC FreeBSD ports repository Modified files: www Makefile www/xpi-conkeror Makefile distinfo pkg-descr Added files: www/xpi-conkeror/files patch-conkeror Log: - Update to 20090821 - Take maintainership to Submitter [1] - Connect to the build PR: ports/136010 ports/138022 Submitted by: Anonymous <swell.k@gmail.com> Submitted by: Ashish SHUKLA <wahjava@gmail.com> [1] Revision Changes Path 1.2433 +1 -1 ports/www/Makefile 1.15 +38 -18 ports/www/xpi-conkeror/Makefile 1.10 +3 -3 ports/www/xpi-conkeror/distinfo 1.1 +18 -0 ports/www/xpi-conkeror/files/patch-conkeror (new) 1.3 +1 -1 ports/www/xpi-conkeror/pkg-descr _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
dhn 2009-09-05 15:55:54 UTC FreeBSD ports repository Modified files: . MOVED Removed files: www/conkeror Makefile distinfo pkg-descr www/conkeror/files chrome.manifest Log: - Please use www/xpi-conkeror PR: ports/136010 Submitted by: Anonymous <swell.k@gmail.com> Revision Changes Path 1.1977 +2 -1 ports/MOVED 1.14 +0 -35 ports/www/conkeror/Makefile (dead) 1.9 +0 -3 ports/www/conkeror/distinfo (dead) 1.2 +0 -2 ports/www/conkeror/files/chrome.manifest (dead) 1.2 +0 -8 ports/www/conkeror/pkg-descr (dead) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!
The last move after repocopy ended up in a way I didn't intend. I wanted move: www/conkeror -> www/xpi-conkeror (CVS history saved) add: www/conkeror (new, with blank CVS history) Above patch was a response for miwi@ request and meant for www/cokeror and *NOT* for www/xpi-conkeror. So, that one can continue to use XPI extension and have a choice to install XulApp Conkeror which is currently maintained. Current situation doesn't make sense. www/xpi-conkeror doesn't install XPI extension but XulApp and uses `xpi-' suffix in dirname despite not having PKGNAMEPREFIX. Sorry.
Don't you plan to untangle the mess? Since XPI extension is no longer maintained upstream we can leave it in Attic but we'd still need to 1. move removed www/conkeror back to www/xpi-conkeror (xpi port) 2. move www/xpi-conkeror to www/conkeror (libxul port) This kind of repo surgery needed mostly because we're stuck with old VCS that doesn't support easy revert incorrect move/copy operation.
Anonymous writes: > Don't you plan to untangle the mess? Since XPI extension is no longer > maintained upstream we can leave it in Attic but we'd still need to > 1. move removed www/conkeror back to www/xpi-conkeror (xpi port) > 2. move www/xpi-conkeror to www/conkeror (libxul port) > This kind of repo surgery needed mostly because we're stuck with old VCS > that doesn't support easy revert incorrect move/copy operation. Sorry, right now I'm a bit occupied with work. I'll look at this in a day or two. Thanks -- Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0 freebsd.org!ashish | http://people.freebsd.org/~ashish/ Avoid Success At All Costs !!
Anonymous writes: > Don't you plan to untangle the mess? Since XPI extension is no longer > maintained upstream we can leave it in Attic but we'd still need to > 1. move removed www/conkeror back to www/xpi-conkeror (xpi port) Okay, and then remove it, right ? > 2. move www/xpi-conkeror to www/conkeror (libxul port) This seems right to me. > This kind of repo surgery needed mostly because we're stuck with old VCS > that doesn't support easy revert incorrect move/copy operation. Thanks -- Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0 freebsd.org!ashish | http://people.freebsd.org/~ashish/ Avoid Success At All Costs !!
ashish@FreeBSD.org (Ashish SHUKLA) writes: > Anonymous writes: >> Don't you plan to untangle the mess? Since XPI extension is no longer >> maintained upstream we can leave it in Attic but we'd still need to >> 1. move removed www/conkeror back to www/xpi-conkeror (xpi port) > > Okay, and then remove it, right ? It's already in Attic. We just need it to be the history of XPI port. > >> 2. move www/xpi-conkeror to www/conkeror (libxul port) > > This seems right to me. It already has correct history but for non-XPI port. In short, swap the ports $ cd /home/ncvs/ports/www $ mv conkeror conkeror.tmp $ mv xpi-conkeror conkeror $ mv conkeror.tmp xpi-conkeror then make a commit o (forced) in non-XPI port to note it's moved back to www/conkeror o swap entry for the ports in ports/MOVED file -www/conkeror|www/xpi-conkeror|2009-09-05|Please use www/xpi-conkeror +www/xpi-conkeror|www/conkeror|2009-09-05|Deprecated in favor of www/conkeror Now, I don't think it's possible to untangle the mess without sinking hands in history altering. It'd look like www/xpi-conkeror port existed in 2006. And the only thing that'd remind us about mistake is dhn@'s commit log in both ports because fixing it'd require altering ,v files[1]. [1] here is a diff --- a.diff begins here --- --- www/xpi-conkeror/Attic/Makefile,v~ +++ www/xpi-conkeror/Attic/Makefile,v @@ -91,7 +91,7 @@ desc 1.14 log -@- Please use www/xpi-conkeror +@- Please use www/conkeror PR: ports/136010 Submitted by: Anonymous <swell.k@@gmail.com> --- www/conkeror/Makefile,v~ +++ www/conkeror/Makefile,v @@ -239,7 +239,7 @@ text 1.14 log -@Force commit to note repocopy from www/conkeror too www/xpi-conkeror +@Force commit to note repocopy from www/xpi-conkeror too www/conkeror @ text @d9 1 --- a.diff ends here ---