Attachment 170577 Details for Bug 209301 – www_xombrero.diff

[patch] www_xombrero.diff

www_xombrero.diff (text/plain), 3.28 KB, created by tkato432 on 2016-05-23 18:30:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-05-23 18:30:35 UTC

Size: 3.28 KB

patch

obsolete

>diff -urN /usr/ports/www/xombrero/Makefile www/xombrero/Makefile
>--- /usr/ports/www/xombrero/Makefile	2016-05-06 08:36:13.148254000 +0900
>+++ www/xombrero/Makefile	2016-05-24 00:00:00.000000000 +0900
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	xombrero
> PORTVERSION=	1.6.4
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	https://opensource.conformal.com/snapshots/xombrero/
> 
>@@ -20,6 +21,7 @@
> 
> BUILD_WRKSRC=	${WRKSRC}/freebsd
> 
>+OPTIONS_DEFINE=		EXAMPLES
> OPTIONS_SINGLE=		GTK
> OPTIONS_SINGLE_GTK=	GTK2 GTK3
> OPTIONS_DEFAULT=	GTK3
>@@ -38,19 +40,27 @@
> 	@cd ${WRKSRC}; ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
> 		-e 's|# ssl_ca_file|ssl_ca_file|' \
> 		-e 's|/etc/ssl/cert.pem|${LOCALBASE}/share/certs/ca-root-nss.crt|' \
>-			unix.c xombrero.conf
>+			xombrero.conf
>+	@cd ${WRKSRC}; ${REINPLACE_CMD} -e '/^Icons/s|$xombrero$.*|\1|' \
>+		-e '/^Categories/s|Application;|GTK;WebBrowser;|' \
>+			xombrero.desktop
>+
>+pre-build:
>+	@(cd ${BUILD_WRKSRC} && ${DO_MAKE_BUILD} ../javascript.h ../tooltip.h)
>+
> do-install:
> 	${INSTALL_SCRIPT} ${WRKDIR}/xombrero ${STAGEDIR}${PREFIX}/bin/xombrero
> 	${INSTALL_PROGRAM} ${WRKSRC}/freebsd/xombrero ${STAGEDIR}${PREFIX}/bin/xombrero-bin
> 	${INSTALL_MAN} ${WRKSRC}/xombrero.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
>-.for i in 16 32 48 64 128 256
>-	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
>-	${INSTALL_DATA} ${WRKSRC}/xombreroicon${i}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
>-.endfor
> 	${MKDIR} ${STAGEDIR}${DATADIR}
> .for i in favicon.ico hsts-preload style.css tld-rules torenabled.ico tordisabled.ico xombrero.css
> 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DATADIR}
> .endfor
>+.for i in 16 32 48 64 128 256
>+	${INSTALL_DATA} ${WRKSRC}/xombreroicon${i}.png ${STAGEDIR}${DATADIR}
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
>+	${LN} -sf ${DATADIR}/xombreroicon${i}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/xombrero.png
>+.endfor
> 	${INSTALL_DATA} ${WRKSRC}/xombrero.desktop ${STAGEDIR}${PREFIX}/share/applications
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> .for i in favorites xombrero.conf
>diff -urN /usr/ports/www/xombrero/pkg-plist www/xombrero/pkg-plist
>--- /usr/ports/www/xombrero/pkg-plist	2016-05-06 08:36:13.255993000 +0900
>+++ www/xombrero/pkg-plist	2016-05-24 00:00:00.000000000 +0900
>@@ -2,12 +2,12 @@
> bin/xombrero-bin
> man/man1/xombrero.1.gz
> share/applications/xombrero.desktop
>-share/icons/hicolor/256x256/apps/xombreroicon256.png
>-share/icons/hicolor/128x128/apps/xombreroicon128.png
>-share/icons/hicolor/16x16/apps/xombreroicon16.png
>-share/icons/hicolor/32x32/apps/xombreroicon32.png
>-share/icons/hicolor/48x48/apps/xombreroicon48.png
>-share/icons/hicolor/64x64/apps/xombreroicon64.png
>+share/icons/hicolor/128x128/apps/xombrero.png
>+share/icons/hicolor/16x16/apps/xombrero.png
>+share/icons/hicolor/256x256/apps/xombrero.png
>+share/icons/hicolor/32x32/apps/xombrero.png
>+share/icons/hicolor/48x48/apps/xombrero.png
>+share/icons/hicolor/64x64/apps/xombrero.png
> %%DATADIR%%/favicon.ico
> %%DATADIR%%/hsts-preload
> %%DATADIR%%/style.css
>@@ -15,3 +15,9 @@
> %%DATADIR%%/tordisabled.ico
> %%DATADIR%%/torenabled.ico
> %%DATADIR%%/xombrero.css
>+%%DATADIR%%/xombreroicon128.png
>+%%DATADIR%%/xombreroicon16.png
>+%%DATADIR%%/xombreroicon256.png
>+%%DATADIR%%/xombreroicon32.png
>+%%DATADIR%%/xombreroicon48.png
>+%%DATADIR%%/xombreroicon64.png

Actions: View | Diff

Attachments on bug 209301: 170015 | 170043 | 170577