From 6aa2e5dc36fca2845e46b075a1127a074218de11 Mon Sep 17 00:00:00 2001
From: nemysis <nemysis@FreeBSD.org>
Date: Mon, 18 Nov 2013 23:26:09 +0000
Subject: - Update to 0.4.2 - Add dependency for textproc/p5-XML-Parser -
 USE_GNOME cairo instead of graphics/cairo - Support STAGEDIR - Use
 patch-src__interface.c instead of patch-src-interface.c

Approved by:	pawel / wg (mentors, implicit
---
 games/hitori/Makefile                     | 20 +++++++++-----------
 games/hitori/distinfo                     |  4 ++--
 games/hitori/files/patch-src-interface.c  | 10 ----------
 games/hitori/files/patch-src__interface.c | 10 ++++++++++
 4 files changed, 21 insertions(+), 23 deletions(-)
 delete mode 100644 games/hitori/files/patch-src-interface.c
 create mode 100644 games/hitori/files/patch-src__interface.c

(limited to 'games')

diff --git a/games/hitori/Makefile b/games/hitori/Makefile
index 803b578a338c..2b3d0e942d58 100644
--- a/games/hitori/Makefile
+++ b/games/hitori/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hitori
-PORTVERSION=	0.4.1
+PORTVERSION=	0.4.2
 CATEGORIES=	games
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,13 +16,13 @@ LICENSE_NAME_CCbyNCSA3=	Attribution-NonCommercial-ShareAlike 3.0 Unported
 LICENSE_FILE_CCbyNCSA3=	${WRKSRC}/COPYING-DOCS
 LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept
 
-BUILD_DEPENDS=	xml2po:${PORTSDIR}/textproc/gnome-doc-utils \
+BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
+		xml2po:${PORTSDIR}/textproc/gnome-doc-utils \
 		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
 
 USE_XZ=		yes
 USES=		gmake pkgconfig desktop-file-utils
-USE_GNOME=	glib20 gtk30
+USE_GNOME=	cairo glib20 gtk30
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
@@ -34,21 +34,19 @@ OPTIONS_SUB=	yes
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
 .if ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e 's|$$(prefix)/$$(DATADIRNAME)/locale|$$(prefix)/share/locale|' \
+	@${REINPLACE_CMD} -e 's|$$(DATADIRNAME)/locale|share/locale|' \
 		${WRKSRC}/po/Makefile.in.in
 .endif
 
 post-install:
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+	${STAGEDIR}${PREFIX}/share/pixmaps/
 
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/hitori/distinfo b/games/hitori/distinfo
index 196ea02fb970..a88d5efe1ae0 100644
--- a/games/hitori/distinfo
+++ b/games/hitori/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/hitori-0.4.1.tar.xz) = 7a34ea697086cabd48ef740370f69995c9487def78ad7c9f280279eea2f282af
-SIZE (gnome2/hitori-0.4.1.tar.xz) = 456752
+SHA256 (gnome2/hitori-0.4.2.tar.xz) = 0df62df7f41ca1648d6a53362aa3c00d90406e39f5d063f9b9d51dbc465c77eb
+SIZE (gnome2/hitori-0.4.2.tar.xz) = 461932
diff --git a/games/hitori/files/patch-src-interface.c b/games/hitori/files/patch-src-interface.c
deleted file mode 100644
index ec5cc92b0570..000000000000
--- a/games/hitori/files/patch-src-interface.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/interface.c.orig	2012-09-29 03:47:48.000000000 +0200
-+++ src/interface.c	2012-11-02 15:11:34.000000000 +0100
-@@ -26,6 +26,7 @@
- #include "main.h"
- #include "interface.h"
- #include "rules.h"
-+#include <string.h>
- 
- #define NORMAL_FONT_SCALE 0.9
- #define PAINTED_FONT_SCALE 0.6
diff --git a/games/hitori/files/patch-src__interface.c b/games/hitori/files/patch-src__interface.c
new file mode 100644
index 000000000000..0593bd7298fb
--- /dev/null
+++ b/games/hitori/files/patch-src__interface.c
@@ -0,0 +1,10 @@
+--- ./src/interface.c.orig	2013-10-10 10:27:44.000000000 +0200
++++ ./src/interface.c	2013-11-12 19:36:25.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include "main.h"
+ #include "interface.h"
+ #include "rules.h"
++#include <string.h>
+ 
+ #define NORMAL_FONT_SCALE 0.9
+ #define PAINTED_FONT_SCALE 0.6
-- 
cgit