svn commit: r405869 - in head/www/xpi-conkeror: . files
Ashish SHUKLA
ashish at FreeBSD.org
Tue Jan 12 12:48:26 UTC 2016
Author: ashish
Date: Tue Jan 12 12:48:24 2016
New Revision: 405869
URL: https://svnweb.freebsd.org/changeset/ports/405869
Log:
- Update to latest git revision
- Simplify build handling and respect build flags[1]
- Switch to options helpers[1]
- Remove unneeded @dir's from plist[1]
- Add build dependency on gmake
- Fix conkeror script to be PREFIX independent
- Update dependency on firefox to be inclusive
PR: 205576
Submitted by: amdmi3[1]
Modified:
head/www/xpi-conkeror/Makefile
head/www/xpi-conkeror/distinfo
head/www/xpi-conkeror/files/patch-conkeror
head/www/xpi-conkeror/pkg-plist
Modified: head/www/xpi-conkeror/Makefile
==============================================================================
--- head/www/xpi-conkeror/Makefile Tue Jan 12 12:42:59 2016 (r405868)
+++ head/www/xpi-conkeror/Makefile Tue Jan 12 12:48:24 2016 (r405869)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= conkeror
-PORTVERSION= 20140911
+PORTVERSION= 20150730
CATEGORIES= www
MASTER_SITES= http://distfiles.pirateparty.in/ashish/ \
LOCAL/ashish
@@ -19,20 +19,19 @@ FIREFOX_DESC?= Use XULRunner from Firefo
LIBXUL_DESC?= Use XULRunner from LibXUL port
OPTIONS_DEFAULT+= LIBXUL
-USES= desktop-file-utils tar:xz
+USES= desktop-file-utils tar:xz gmake
LIBXUL_USES= gecko
-FIREFOX_USES= gecko:firefox,32
-
-.include <bsd.port.options.mk>
+FIREFOX_USES= gecko:firefox,32+
+ALL_TARGET= # empty
BUILD_ID= ${ECHO_CMD} -n `whoami`@`hostname`_`date +%s`
post-patch:
cd ${WRKSRC} && \
- ${MV} debian/conkeror.desktop . && \
+ ${MV} contrib/conkeror.desktop . && \
${MV} contrib/man/conkeror.1 . && \
- ${RM} -rf contrib/debian contrib/man debian tests && \
+ ${RM} -rf contrib/debian contrib/dist contrib/man debian tests && \
${RM} -f contrib/build.sh contrib/install.sh contrib/mketags.sh \
contrib/testrun.sh contrib/run-conkeror && \
${MKDIR} share && \
@@ -41,14 +40,12 @@ post-patch:
style share && \
${MV} COPYING CREDITS Info.plist chrome.manifest \
content-policy.manifest share
-.if ${PORT_OPTIONS:MFIREFOX}
+ ${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR},g" ${WRKSRC}/conkeror
+
+post-patch-FIREFOX-on:
${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}
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/libexec/conkeror
Modified: head/www/xpi-conkeror/distinfo
==============================================================================
--- head/www/xpi-conkeror/distinfo Tue Jan 12 12:42:59 2016 (r405868)
+++ head/www/xpi-conkeror/distinfo Tue Jan 12 12:48:24 2016 (r405869)
@@ -1,2 +1,2 @@
-SHA256 (conkeror-20140911.tar.xz) = c5ac96c56ff7695f522162e2a4080e3c8c111a62131b6912718475c6ff2890d8
-SIZE (conkeror-20140911.tar.xz) = 240232
+SHA256 (conkeror-20150730.tar.xz) = 7695fc4e429b2ba6c035ccddc8ecc72cc6a248297999451102c867d8df4c726d
+SIZE (conkeror-20150730.tar.xz) = 242640
Modified: head/www/xpi-conkeror/files/patch-conkeror
==============================================================================
--- head/www/xpi-conkeror/files/patch-conkeror Tue Jan 12 12:42:59 2016 (r405868)
+++ head/www/xpi-conkeror/files/patch-conkeror Tue Jan 12 12:48:24 2016 (r405869)
@@ -10,6 +10,6 @@
+elif [ ! -x "${XULRUNNER}" ]; then
+ echo ${XULRUNNER} is not executable.
+else
-+ exec ${XULRUNNER} /usr/local/share/conkeror/application.ini "$@"
++ exec ${XULRUNNER} %%DATADIR%%/application.ini "$@"
+fi
+
Modified: head/www/xpi-conkeror/pkg-plist
==============================================================================
--- head/www/xpi-conkeror/pkg-plist Tue Jan 12 12:42:59 2016 (r405868)
+++ head/www/xpi-conkeror/pkg-plist Tue Jan 12 12:48:24 2016 (r405869)
@@ -225,37 +225,3 @@ share/applications/conkeror.desktop
%%DATADIR%%/style/gesso/theme.json
%%DATADIR%%/style/mono/conkeror--mono.css
%%DATADIR%%/style/mono/theme.json
- at dir %%DATADIR%%/style/default
- at dir %%DATADIR%%/style/gesso
- at dir %%DATADIR%%/style/mono
- at dir %%DATADIR%%/style
- at dir %%DATADIR%%/search-engines
- at dir %%DATADIR%%/modules/page-modes
- at dir %%DATADIR%%/modules/extensions
- at dir %%DATADIR%%/modules/compat
- at dir %%DATADIR%%/modules/bindings/default/content-buffer
- at dir %%DATADIR%%/modules/bindings/default
- at dir %%DATADIR%%/modules/bindings
- at dir %%DATADIR%%/modules
- at dir %%DATADIR%%/locale/sv-SE
- at dir %%DATADIR%%/locale/en-US
- at dir %%DATADIR%%/locale
- at dir %%DATADIR%%/help
- at dir %%DATADIR%%/defaults/preferences
- at dir %%DATADIR%%/defaults
- at dir %%DATADIR%%/contrib/art
- at dir %%DATADIR%%/contrib/config
- at dir %%DATADIR%%/contrib/modules
- at dir %%DATADIR%%/contrib/xrev/defaults/preferences
- at dir %%DATADIR%%/contrib/xrev/defaults
- at dir %%DATADIR%%/contrib/xrev/content
- at dir %%DATADIR%%/contrib/xrev/chrome
- at dir %%DATADIR%%/contrib/xrev
- at dir %%DATADIR%%/contrib
- at dir %%DATADIR%%/content
- at dir %%DATADIR%%/components
- at dir %%DATADIR%%/chrome
- at dir %%DATADIR%%/branding/content
- at dir %%DATADIR%%/branding
- at dir %%DATADIR%%
- at dir libexec/conkeror
More information about the svn-ports-head
mailing list