Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Dec 2014 01:58:49 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r375517 - head/misc/xiphos
Message-ID:  <201412250158.sBP1wnFr086940@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Dec 25 01:58:48 2014
New Revision: 375517
URL: https://svnweb.freebsd.org/changeset/ports/375517
QAT: https://qat.redports.org/buildarchive/r375517/

Log:
  Fix staging
  Remove useless gnomehack

Modified:
  head/misc/xiphos/Makefile
  head/misc/xiphos/pkg-plist

Modified: head/misc/xiphos/Makefile
==============================================================================
--- head/misc/xiphos/Makefile	Thu Dec 25 01:51:13 2014	(r375516)
+++ head/misc/xiphos/Makefile	Thu Dec 25 01:58:48 2014	(r375517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xiphos
 PORTVERSION=	3.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc gnome
 MASTER_SITES=	SF/gnomesword/Xiphos/${PORTVERSION}
 
@@ -22,19 +22,20 @@ LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTS
 USES=		gettext pkgconfig python:build
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomehack gnomeprefix gtkhtml3 intlhack libgsf
+USE_GNOME=	gnomeprefix gtkhtml3 intlhack libgsf
 
 OPTIONS_DEFINE=	DOCS
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./waf configure \
-		--prefix=${STAGEDIR}${PREFIX} --destdir=${STAGEDIR}${PREFIX} \
+		--prefix=${PREFIX} --destdir=${STAGEDIR} \
 		${WAF_CONFIGURE_ARGS}
 
 do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf build
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf build --prefix=${PREFIX} --destdir=${STAGEDIR}
 
 do-install:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf install
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf install --prefix=${PREFIX} --destdir=${STAGEDIR}
+	@${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/icon-theme.cache
 
 .include <bsd.port.mk>

Modified: head/misc/xiphos/pkg-plist
==============================================================================
--- head/misc/xiphos/pkg-plist	Thu Dec 25 01:51:13 2014	(r375516)
+++ head/misc/xiphos/pkg-plist	Thu Dec 25 01:58:48 2014	(r375517)
@@ -121,7 +121,6 @@ share/gnome/help/xiphos/fr/figures/sword
 share/gnome/help/xiphos/fr/figures/sword_remove.png
 share/gnome/help/xiphos/fr/figures/sword_sources.png
 share/gnome/help/xiphos/fr/xiphos.xml
-share/icons/hicolor/icon-theme.cache
 share/icons/hicolor/scalable/apps/xiphos.svg
 share/locale/ar/LC_MESSAGES/xiphos.mo
 share/locale/cs/LC_MESSAGES/xiphos.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412250158.sBP1wnFr086940>