From owner-svn-ports-head@FreeBSD.ORG Mon Dec 9 11:02:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0583ED2E; Mon, 9 Dec 2013 11:02:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DA94D1DC4; Mon, 9 Dec 2013 11:02:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9B20Kg056968; Mon, 9 Dec 2013 11:02:00 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9B20dx056961; Mon, 9 Dec 2013 11:02:00 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201312091102.rB9B20dx056961@svn.freebsd.org> From: Niclas Zeising Date: Mon, 9 Dec 2013 11:02:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335965 - in head/www/xombrero: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 11:02:01 -0000 Author: zeising Date: Mon Dec 9 11:01:59 2013 New Revision: 335965 URL: http://svnweb.freebsd.org/changeset/ports/335965 Log: Update to 1.6.3 Stagify. Modified: head/www/xombrero/Makefile head/www/xombrero/distinfo head/www/xombrero/files/patch-freebsd__Makefile head/www/xombrero/pkg-plist Modified: head/www/xombrero/Makefile ============================================================================== --- head/www/xombrero/Makefile Mon Dec 9 10:56:08 2013 (r335964) +++ head/www/xombrero/Makefile Mon Dec 9 11:01:59 2013 (r335965) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xombrero -PORTVERSION= 1.6.0 +PORTVERSION= 1.6.3 CATEGORIES= www MASTER_SITES= https://opensource.conformal.com/snapshots/xombrero/ EXTRACT_SUFX= .tgz @@ -19,19 +19,14 @@ USES= pkgconfig perl5 USE_PERL5= build INSTALLS_ICONS= yes -MAN1= xombrero.1 -PORTEXAMPLES= favorites playflash.sh xombrero.conf - BUILD_WRKSRC= ${WRKSRC}/freebsd -OPTIONS_DEFINE= EXAMPLES OPTIONS_SINGLE= GTK OPTIONS_SINGLE_GTK=GTK2 GTK3 -OPTIONS_DEFAULT=EXAMPLES GTK3 +OPTIONS_DEFAULT=GTK3 SUB_FILES= xombrero -NO_STAGE= yes .include .if ${OSVERSION} < 800041 @@ -54,24 +49,22 @@ post-patch: -e 's|/etc/ssl/cert.pem|${LOCALBASE}/share/certs/ca-root-nss.crt|' \ unix.c xombrero.conf do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/xombrero ${PREFIX}/bin/xombrero - ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/xombrero ${PREFIX}/bin/xombrero-bin - ${INSTALL_MAN} ${WRKSRC}/xombrero.1 ${MANPREFIX}/man/man1 + ${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 - ${MKDIR} ${PREFIX}/share/icons/hicolor/${i}x${i}/apps - ${INSTALL_DATA} ${WRKSRC}/xombreroicon${i}.png ${PREFIX}/share/icons/hicolor/${i}x${i}/apps + ${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} ${DATADIR} + ${MKDIR} ${STAGEDIR}${DATADIR} .for i in hsts-preload style.css tld-rules - ${INSTALL_DATA} ${WRKSRC}/${i} ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DATADIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/xombrero.desktop ${PREFIX}/share/applications -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/xombrero.desktop ${STAGEDIR}${PREFIX}/share/applications + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for i in favorites xombrero.conf - ${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${EXAMPLESDIR} .endfor - ${INSTALL_SCRIPT} ${WRKSRC}/playflash.sh ${EXAMPLESDIR} -.endif + ${INSTALL_SCRIPT} ${WRKSRC}/playflash.sh ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/www/xombrero/distinfo ============================================================================== --- head/www/xombrero/distinfo Mon Dec 9 10:56:08 2013 (r335964) +++ head/www/xombrero/distinfo Mon Dec 9 11:01:59 2013 (r335965) @@ -1,2 +1,2 @@ -SHA256 (xombrero-1.6.0.tgz) = afc615b68eddc096569bab973901e3153e4b4230d88916d930a59ccd364a5d17 -SIZE (xombrero-1.6.0.tgz) = 289902 +SHA256 (xombrero-1.6.3.tgz) = 481011c136206f7aa3ab4cdf49ad77f81df4d5585f9e9a20c651bfaaaa537f79 +SIZE (xombrero-1.6.3.tgz) = 290478 Modified: head/www/xombrero/files/patch-freebsd__Makefile ============================================================================== --- head/www/xombrero/files/patch-freebsd__Makefile Mon Dec 9 10:56:08 2013 (r335964) +++ head/www/xombrero/files/patch-freebsd__Makefile Mon Dec 9 11:01:59 2013 (r335965) @@ -1,9 +1,9 @@ ---- freebsd/Makefile.orig 2013-05-16 18:12:42.000000000 +0200 -+++ freebsd/Makefile 2013-05-22 13:40:50.369368284 +0200 +--- freebsd/Makefile.orig 2013-12-08 20:54:46.651261821 +0100 ++++ freebsd/Makefile 2013-12-08 20:55:15.418253611 +0100 @@ -9,7 +9,7 @@ - LDADD= -lutil -lgcrypt - GTK_CFLAGS!= pkg-config --cflags $(LIBS) - GTK_LDFLAGS!= pkg-config --libs $(LIBS) + LDADD= -lutil + GTK_CFLAGS!= pkgconf --cflags $(LIBS) + GTK_LDFLAGS!= pkgconf --libs $(LIBS) -CFLAGS+= $(GTK_CFLAGS) -O2 -Wall -I. -I.. +CFLAGS+= $(GTK_CFLAGS) -Wall -I. -I.. LDFLAGS+= $(GTK_LDFLAGS) Modified: head/www/xombrero/pkg-plist ============================================================================== --- head/www/xombrero/pkg-plist Mon Dec 9 10:56:08 2013 (r335964) +++ head/www/xombrero/pkg-plist Mon Dec 9 11:01:59 2013 (r335965) @@ -1,5 +1,6 @@ bin/xombrero bin/xombrero-bin +man/man1/xombrero.1.gz share/applications/xombrero.desktop share/icons/hicolor/128x128/apps/xombreroicon128.png share/icons/hicolor/16x16/apps/xombreroicon16.png @@ -9,6 +10,10 @@ share/icons/hicolor/64x64/apps/xombreroi %%DATADIR%%/hsts-preload %%DATADIR%%/style.css %%DATADIR%%/tld-rules +%%EXAMPLESDIR%%/favorites +%%EXAMPLESDIR%%/playflash.sh +%%EXAMPLESDIR%%/xombrero.conf +@dirrm %%EXAMPLESDIR%% @dirrm %%DATADIR%% @dirrmtry share/icons/hicolor/64x64/apps @dirrmtry share/icons/hicolor/64x64