Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 05 Jun 2013 14:13:26 +0200
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        amdmi3@FreeBSD.org
Subject:   ports/179329: [PATCH] games/plee-the-bear: Fix manual pages, add license, NLS, OptionsNG
Message-ID:  <20130605121330.60A511D6@hub.freebsd.org>
Resent-Message-ID: <201306051220.r55CK0ue028770@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         179329
>Category:       ports
>Synopsis:       [PATCH] games/plee-the-bear: Fix manual pages, add license, NLS, OptionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 05 12:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013
>Description:

- Add license
- Add dependency for textproc/docbook-to-man
- Fix manual pages
- Add NLS Options
- Add OptionsNG
- Fix NLS
- Update WWW
- Trim pkg-plist, remove mtree

Port maintainer (amdmi3@FreeBSD.org) is cc'd.

Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_7 (mode: change, diff: ports)
>How-To-Repeat:

Build log, plee-the-bear-0.6.0_4

https://redports.org/buildarchive/20130604223500-39521/


Build log, plee-the-bear-0.6.0_3

https://redports.org/buildarchive/20130604122201-38548/

docbook-to-man was not found on your system. The manpages of the engine are not generated.

docbook-to-man was not found on your system. The manpages of Plee the Bear are not generated.


port test in normal FreeBSD_Ports Jail or native

pkg info | grep docbook-to-man
docbook-to-man-1.0_2           A DocBook SGML DTD into nroff/troff -man macros converter

...
The deinstallation will free 44 MB
Deleting plee-the-bear-0.6.0_3... done
===> Extra files and directories check
share/man/man6/running-bear.6
share/man/man6/plee-the-bear.6
@dirrmtry share/man/man6
===> Cleaning up after port test
===>  Cleaning for plee-the-bear-0.6.0_3
===>  Removing existing /var/tmp/ports/plee-the-bear-0.6.0_3 dir
===> Done.

>Fix:

--- plee-the-bear-0.6.0_4.patch begins here ---
diff -ruN /usr/ports/games/plee-the-bear/Makefile ./Makefile
--- /usr/ports/games/plee-the-bear/Makefile	2013-06-02 18:54:34.000000000 +0200
+++ ./Makefile	2013-06-05 00:33:46.000000000 +0200
@@ -3,13 +3,20 @@
 
 PORTNAME=	plee-the-bear
 PORTVERSION=	0.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/Plee%20the%20Bear/${PORTVERSION:R}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	2D platform jump and run game
 
+LICENSE=	GPLv2 CCbyNCSA3
+LICENSE_COMB=	dual
+LICENSE_NAME_CCbyNCSA3=Attribution-NonCommercial-ShareAlike 3.0 Unported
+LICENSE_FILE_CCbyNCSA3=${WRKSRC}/CCPL
+LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror 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
 
@@ -21,8 +28,36 @@
 MAKE_JOBS_SAFE=	yes
 USE_GCC=	4.6+
 
-USES=		cmake gettext
+USES=		cmake
 CMAKE_ARGS=	-Dlibclaw_DIR="${LOCALBASE}/share/libclaw/cmake" \
-		-DBEAR_NO_EDITOR=YES
+		-DBEAR_NO_EDITOR=YES -DBEAR_NO_MANPAGES=YES
+
+MAN6=		plee-the-bear.6 running-bear.6
+
+OPTIONS_DEFINE=	NLS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+post-patch:
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e 's|locale||' \
+		${WRKSRC}/bear-engine/desktop/CMakeLists.txt \
+		${WRKSRC}/plee-the-bear/desktop/CMakeLists.txt
+.endif
+
+post-build:
+	@(cd ${WRKSRC}/bear-engine/desktop/man && docbook-to-man running-bear.sgml > running-bear.6)
+	@(cd ${WRKSRC}/plee-the-bear/desktop/man && docbook-to-man plee-the-bear.sgml > plee-the-bear.6)
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/bear-engine/desktop/man/running-bear.6 ${MAN6PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/plee-the-bear/desktop/man/plee-the-bear.6 ${MAN6PREFIX}/man/man6
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/games/plee-the-bear/pkg-descr ./pkg-descr
--- /usr/ports/games/plee-the-bear/pkg-descr	2013-06-02 18:54:34.000000000 +0200
+++ ./pkg-descr	2013-06-04 12:50:35.000000000 +0200
@@ -3,4 +3,4 @@
 of games). You're a bear, trying to catch his son, which ran away
 after he ate all your honey.
 
-WWW: http://plee-the-bear.sourceforge.net/
+WWW: http://sourceforge.net/projects/plee-the-bear/
diff -ruN /usr/ports/games/plee-the-bear/pkg-plist ./pkg-plist
--- /usr/ports/games/plee-the-bear/pkg-plist	2013-06-02 18:54:34.000000000 +0200
+++ ./pkg-plist	2013-06-04 13:32:29.000000000 +0200
@@ -108,10 +108,10 @@
 share/icons/hicolor/32x32/apps/ptb.png
 share/icons/hicolor/48x48/apps/ptb.png
 share/icons/hicolor/64x64/apps/ptb.png
-share/locale/fr/LC_MESSAGES/bear-engine.mo
-share/locale/fr/LC_MESSAGES/plee-the-bear.mo
-share/locale/nn/LC_MESSAGES/bear-engine.mo
-share/locale/nn/LC_MESSAGES/plee-the-bear.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/bear-engine.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/plee-the-bear.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/bear-engine.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/plee-the-bear.mo
 share/pixmaps/ptb.png
 share/pixmaps/ptb.xpm
 %%DATADIR%%/animation/air_bubble_generator.canim
@@ -890,20 +890,6 @@
 @dirrm %%DATADIR%%/animation/effect
 @dirrm %%DATADIR%%/animation
 @dirrm %%DATADIR%%
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
 @dirrm share/bear-factory/plee-the-bear/item-description/mini-game
 @dirrm share/bear-factory/plee-the-bear/item-description/item_brick
 @dirrm share/bear-factory/plee-the-bear/item-description/forest
--- plee-the-bear-0.6.0_4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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