From 97a4c2caa8dc0acb750e9540f6cf442340b2d7c2 Mon Sep 17 00:00:00 2001
From: amdmi3 <amdmi3@FreeBSD.org>
Date: Wed, 25 Sep 2013 03:47:08 +0000
Subject: - Support staging - Use new LIB_DEPENDS syntax - Fix NLS support in
 games/plee-the-bear

---
 devel/libclaw/Makefile        |  6 ++----
 games/plee-the-bear/Makefile  | 26 +++++++++++---------------
 games/plee-the-bear/pkg-plist |  2 ++
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/devel/libclaw/Makefile b/devel/libclaw/Makefile
index ccfab8964ce8..965557211886 100644
--- a/devel/libclaw/Makefile
+++ b/devel/libclaw/Makefile
@@ -9,16 +9,14 @@ MASTER_SITES=	SF
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	C++ Library Absolutely Wonderful
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/bind.hpp:${PORTSDIR}/devel/boost-libs
 
 USES=		cmake gettext
 CMAKE_ARGS=	-DCLAW_CMAKE_MODULES_INSTALL_PATH="${DATADIR}/cmake"
 USE_LDCONFIG=	yes
-#USE_GCC=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e '/subdirs/ s|doc||' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/install.*COPYING/ d' ${WRKSRC}/CMakeLists.txt
diff --git a/games/plee-the-bear/Makefile b/games/plee-the-bear/Makefile
index a9e086af2075..73625c810e2e 100644
--- a/games/plee-the-bear/Makefile
+++ b/games/plee-the-bear/Makefile
@@ -12,13 +12,13 @@ COMMENT=	2D platform jump and run game
 
 LICENSE=	GPLv2 CCbySA3
 LICENSE_COMB=	dual
-LICENSE_NAME_CCbySA3=Attribution-ShareAlike 3.0 Unported
-LICENSE_FILE_CCbySA3=${WRKSRC}/CCPL
-LICENSE_PERMS_CCbySA3=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_NAME_CCbySA3=	Attribution-ShareAlike 3.0 Unported
+LICENSE_FILE_CCbySA3=	${WRKSRC}/CCPL
+LICENSE_PERMS_CCbySA3=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man
-LIB_DEPENDS=	boost_filesystem:${PORTSDIR}/devel/boost-libs \
-		claw_application:${PORTSDIR}/devel/libclaw
+LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
+		libclaw_application.so:${PORTSDIR}/devel/libclaw
 
 USE_SDL=	sdl mixer
 USE_GL=		gl glu
@@ -26,26 +26,22 @@ WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 
-USES=		cmake
+# gettext dep is unconditional; NLS option just disables translations install
+USES=		cmake gettext
 CMAKE_ARGS=	-Dlibclaw_DIR="${LOCALBASE}/share/libclaw/cmake" \
 		-DBEAR_NO_EDITOR=YES
 
-MAN6=		plee-the-bear.6 running-bear.6
+OPTIONS_DEFINE=	NLS
+OPTIONS_DEFAULT=NLS
+OPTIONS_SUB=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/CMakeLists.txt
 .if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e 's|locale||' \
+		${WRKSRC}/bear-factory/desktop/CMakeLists.txt \
 		${WRKSRC}/bear-engine/desktop/CMakeLists.txt \
 		${WRKSRC}/plee-the-bear/desktop/CMakeLists.txt
 .endif
diff --git a/games/plee-the-bear/pkg-plist b/games/plee-the-bear/pkg-plist
index d9083b50cff9..d28e336924a6 100644
--- a/games/plee-the-bear/pkg-plist
+++ b/games/plee-the-bear/pkg-plist
@@ -13,6 +13,8 @@ lib/libbear_time.so
 lib/libbear_universe.so
 lib/libbear_visual.so
 lib/libplee_the_bear.so
+man/man6/plee-the-bear.6.gz
+man/man6/running-bear.6.gz
 share/applications/plee-the-bear.desktop
 share/bear-factory/plee-the-bear/item-description/action_file_recorder.xml
 share/bear-factory/plee-the-bear/item-description/add_ingame_layers.xml
-- 
cgit