Upgrade to 1.2.2.

4 files changed, 46 insertions, 15 deletions

diff --git a/games/gomoku.app/Makefile b/games/gomoku.app/Makefile
index 63eca5d4ec56..f19794734f0a 100644
--- a/games/gomoku.app/Makefile
+++ b/games/gomoku.app/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gomoku.app
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.2
 CATEGORIES=	games
 MASTER_SITES=	http://www.gnustep.it/nicola/Applications/Gomoku/
 DISTNAME=	Gomoku-${PORTVERSION}
@@ -14,8 +14,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/GNUstep/System/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep
-RUN_DEPENDS=	${LOCALBASE}/GNUstep/System/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep
+BUILD_DEPENDS=	${XGPSBUNDLEDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
+RUN_DEPENDS=	${XGPSBUNDLEDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
 
 PREFIX=		${LOCALBASE}/GNUstep
 USE_NEWGCC=	yes
@@ -24,6 +24,8 @@ MAKEFILE=	GNUmakefile
 ALL_TARGET=
 NO_MTREE=	yes
 
+XGPSBUNDLEDIR=	${PREFIX}/System/Library/Bundles/libgnustep-xgps.bundle
+
 .include <bsd.port.pre.mk>
 
 .if ${MACHINE_ARCH} == "i386"
@@ -32,7 +34,7 @@ GNU_ARCH=	ix86
 GNU_ARCH=	${MACHINE_ARCH}
 .endif
 
-PLIST_SUB+=	GNU_ARCH=${GNU_ARCH}
+PLIST_SUB+=	GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L}
 
 do-build:
 	@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
diff --git a/games/gomoku.app/distinfo b/games/gomoku.app/distinfo
index ae152e9a833f..80421f028956 100644
--- a/games/gomoku.app/distinfo
+++ b/games/gomoku.app/distinfo
@@ -1 +1 @@
-MD5 (Gomoku-1.1.0.tgz) = cc20a02c8dc3b3227c67eae5d659f6f2
+MD5 (Gomoku-1.2.2.tgz) = ac26c68931aefba5d03e65fc1ce78bf8
diff --git a/games/gomoku.app/pkg-comment b/games/gomoku.app/pkg-comment
index 9b6cd4f9087f..892c3a420b0c 100644
--- a/games/gomoku.app/pkg-comment
+++ b/games/gomoku.app/pkg-comment
@@ -1 +1 @@
-An extended TicTacToe game for GNUstep
+GNUstep Gomoku game
diff --git a/games/gomoku.app/pkg-plist b/games/gomoku.app/pkg-plist
index 8d38e55ea48c..3ebd98860e7d 100644
--- a/games/gomoku.app/pkg-plist
+++ b/games/gomoku.app/pkg-plist
@@ -1,14 +1,43 @@
-Local/Apps/Gomoku.app/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps/Gomoku
-Local/Apps/Gomoku.app/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps/library_paths.openapp
+Local/Apps/Gomoku.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Gomoku
+Local/Apps/Gomoku.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/library_paths.openapp
 Local/Apps/Gomoku.app/Gomoku
-Local/Apps/Gomoku.app/Resources/Gomoku.tiff
+Local/Apps/Gomoku.app/Resources/Computer.png
+Local/Apps/Gomoku.app/Resources/ComputerBottom.png
+Local/Apps/Gomoku.app/Resources/ComputerBottomLeft.png
+Local/Apps/Gomoku.app/Resources/ComputerBottomRight.png
+Local/Apps/Gomoku.app/Resources/ComputerLeft.png
+Local/Apps/Gomoku.app/Resources/ComputerRight.png
+Local/Apps/Gomoku.app/Resources/ComputerTop.png
+Local/Apps/Gomoku.app/Resources/ComputerTopLeft.png
+Local/Apps/Gomoku.app/Resources/ComputerTopRight.png
+Local/Apps/Gomoku.app/Resources/Empty.png
+Local/Apps/Gomoku.app/Resources/EmptyBottom.png
+Local/Apps/Gomoku.app/Resources/EmptyBottomLeft.png
+Local/Apps/Gomoku.app/Resources/EmptyBottomRight.png
+Local/Apps/Gomoku.app/Resources/EmptyLeft.png
+Local/Apps/Gomoku.app/Resources/EmptyRight.png
+Local/Apps/Gomoku.app/Resources/EmptyTop.png
+Local/Apps/Gomoku.app/Resources/EmptyTopLeft.png
+Local/Apps/Gomoku.app/Resources/EmptyTopRight.png
+Local/Apps/Gomoku.app/Resources/English.lproj/Localizable.strings
+Local/Apps/Gomoku.app/Resources/French.lproj/Localizable.strings
+Local/Apps/Gomoku.app/Resources/Gomoku.png
+Local/Apps/Gomoku.app/Resources/Human.png
+Local/Apps/Gomoku.app/Resources/HumanBottom.png
+Local/Apps/Gomoku.app/Resources/HumanBottomLeft.png
+Local/Apps/Gomoku.app/Resources/HumanBottomRight.png
+Local/Apps/Gomoku.app/Resources/HumanLeft.png
+Local/Apps/Gomoku.app/Resources/HumanRight.png
+Local/Apps/Gomoku.app/Resources/HumanTop.png
+Local/Apps/Gomoku.app/Resources/HumanTopLeft.png
+Local/Apps/Gomoku.app/Resources/HumanTopRight.png
 Local/Apps/Gomoku.app/Resources/Info-gnustep.plist
-Local/Apps/Gomoku.app/Resources/computer.png
-Local/Apps/Gomoku.app/Resources/human.png
-Local/Apps/Gomoku.app/Resources/nothing.png
-@dirrm Local/Apps/Gomoku.app/%%GNU_ARCH%%/freebsdelf/gnu-gnu-gnu-xgps
-@dirrm Local/Apps/Gomoku.app/%%GNU_ARCH%%/freebsdelf
+Local/Apps/Gomoku.app/Resources/Italian.lproj/Localizable.strings
+@dirrm Local/Apps/Gomoku.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Apps/Gomoku.app/%%GNU_ARCH%%/%%OPSYS%%
 @dirrm Local/Apps/Gomoku.app/%%GNU_ARCH%%
+@dirrm Local/Apps/Gomoku.app/Resources/Italian.lproj
+@dirrm Local/Apps/Gomoku.app/Resources/French.lproj
+@dirrm Local/Apps/Gomoku.app/Resources/English.lproj
 @dirrm Local/Apps/Gomoku.app/Resources
 @dirrm Local/Apps/Gomoku.app
-@unexec rmdir %D/Local/Apps 2>/dev/null || true