Date: Fri, 30 Nov 2012 21:15:04 +0100 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/174022: [PATCH] games/gnurobots: Added OptionsNG, license, desktop entry, icon, take maintainership Message-ID: <20121130201507.A5480A0B@hub.freebsd.org> Resent-Message-ID: <201211302020.qAUKK0pe011524@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174022
>Category: ports
>Synopsis: [PATCH] games/gnurobots: Added OptionsNG, license, desktop entry, icon, take maintainership
>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: Fri Nov 30 20:20:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:
- Take maintainership
Added file(s):
- files/pkg-install.in
- files/pkg-message.in
Removed file(s):
- pkg-message
Makefile changed:
+MASTER_SITES=
+LICENSE= GPLv3
+SUB_FILES= pkg-install \
+ pkg-message
+DESKTOP_ENTRIES=
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MDOCS}
Changed and refined:
Documentation
+PORTDOCS= *
+DOCSRCDIR1=
+DOCSRCDIR2=
post-install:
pkg-plist
Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
portlint -A
looks fine.
port test: clean
>Fix:
--- gnurobots-1.2.0_9.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/gnurobots/Makefile ./Makefile
--- /usr/ports/games/gnurobots/Makefile 2012-11-16 09:01:38.000000000 +0100
+++ ./Makefile 2012-11-30 21:05:53.000000000 +0100
@@ -7,14 +7,21 @@
PORTNAME= gnurobots
PORTVERSION= 1.2.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
-MASTER_SITES= GNU
+MASTER_SITES= GNU \
+ SF/nemysisfreebsdp/:icons
+DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+ ${PORTNAME}.png:icons
+DIST_SUBDIR= ${PORTNAME}
+EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= nemysis@gmx.ch
COMMENT= GNU diversion wherein Scheme-coded robots explore a world
-LIB_DEPENDS= guile.21:${PORTSDIR}/lang/guile
+LICENSE= GPLv3
+
+LIB_DEPENDS= guile:${PORTSDIR}/lang/guile
USE_GNOME= vte
GNU_CONFIGURE= yes
@@ -22,17 +29,40 @@
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+PORTDOCS= *
+
+DOCSRCDIR1= ${WRKSRC}
+DOC_FILES1= AUTHORS ChangeLog NEWS README THANKS TODO
+
+DOCSRCDIR2= ${WRKSRC}/doc
+DOCSDIR2= ${DOCSDIR}/doc
+DOC_FILES2= Robots-HOWTO contrib
+
+SUB_FILES= pkg-install \
+ pkg-message
+
+DESKTOP_ENTRIES="GNU Robots" "${COMMENT}" "${PORTNAME}" \
+ "${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
+
+.include <bsd.port.options.mk>
+
post-patch:
@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|#include <pty.h>||g' ${WRKSRC}/src/ui-cmdwin.c
post-install:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for f in AUTHORS ChangeLog NEWS README THANKS doc/Robots-HOWTO doc/contrib
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+ ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps
+
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+ ${MKDIR} ${DOCSDIR2}
+ ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
.endif
+
+ @${ECHO_CMD}
@${CAT} ${PKGMESSAGE}
+ @${ECHO_CMD}
+ @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/gnurobots/distinfo ./distinfo
--- /usr/ports/games/gnurobots/distinfo 2012-11-16 09:01:38.000000000 +0100
+++ ./distinfo 2012-11-30 20:33:18.000000000 +0100
@@ -1,2 +1,4 @@
-SHA256 (gnurobots-1.2.0.tar.gz) = 8b6f4f0d40bef5cfdfb7eb7c82ea1402d2747c37b2c7b7aa92faff55351df11d
-SIZE (gnurobots-1.2.0.tar.gz) = 176642
+SHA256 (gnurobots/gnurobots-1.2.0.tar.gz) = 8b6f4f0d40bef5cfdfb7eb7c82ea1402d2747c37b2c7b7aa92faff55351df11d
+SIZE (gnurobots/gnurobots-1.2.0.tar.gz) = 176642
+SHA256 (gnurobots/gnurobots.png) = b5b422f26cd8a380a7891a3d894b5bac1cad744e5d1f29d32ff024b7c019158b
+SIZE (gnurobots/gnurobots.png) = 3052
diff -ruN --exclude=CVS /usr/ports/games/gnurobots/files/pkg-install.in ./files/pkg-install.in
--- /usr/ports/games/gnurobots/files/pkg-install.in 1970-01-01 01:00:00.000000000 +0100
+++ ./files/pkg-install.in 2012-11-30 20:09:41.000000000 +0100
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+echo "This example maps you can use:"
+echo ""
+
+ls -x %%DATADIR%%/maps
+echo ""
+
+echo "This example robots you can use:"
+echo ""
+
+ls -x %%DATADIR%%/scheme
+echo ""
+echo ""
diff -ruN --exclude=CVS /usr/ports/games/gnurobots/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/games/gnurobots/files/pkg-message.in 1970-01-01 01:00:00.000000000 +0100
+++ ./files/pkg-message.in 2012-11-30 19:57:51.000000000 +0100
@@ -0,0 +1,12 @@
+===============================================================================
+
+GNU Robots has been installed.
+
+Where to find things
+
+ - A place to start: %%DOCSDIR%%/Robots-HOWTO
+ - Example maps: %%DATADIR%%/maps/
+ - Example robots: %%DATADIR%%/scheme/
+ - Binaries: gnurobots
+
+===============================================================================
diff -ruN --exclude=CVS /usr/ports/games/gnurobots/pkg-descr ./pkg-descr
--- /usr/ports/games/gnurobots/pkg-descr 2012-11-16 09:01:38.000000000 +0100
+++ ./pkg-descr 2012-11-30 19:44:36.000000000 +0100
@@ -1,6 +1,6 @@
GNU Robots is a game/diversion where you construct a program for a
little robot, then set him loose and watch him explore a world on his
own. The robot program is written in Scheme, and is implemented using
-GNU Guile. --from GNU robots README
+GNU Guile.
WWW: http://www.gnu.org/software/gnurobots/
diff -ruN --exclude=CVS /usr/ports/games/gnurobots/pkg-message ./pkg-message
--- /usr/ports/games/gnurobots/pkg-message 2012-11-16 09:01:38.000000000 +0100
+++ ./pkg-message 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-Where to find things
- - A place to start: $PREFIX/share/doc/gnurobots/Robots-HOWTO
- - Example maps: $PREFIX/share/gnurobots/maps/
- - Example robots: $PREFIX/share/gnurobots/scheme/
- - Binaries: gnurobots
diff -ruN --exclude=CVS /usr/ports/games/gnurobots/pkg-plist ./pkg-plist
--- /usr/ports/games/gnurobots/pkg-plist 2012-11-16 09:01:38.000000000 +0100
+++ ./pkg-plist 2012-11-30 20:44:09.000000000 +0100
@@ -1,11 +1,4 @@
bin/gnurobots
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/Robots-HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/contrib
%%DATADIR%%/maps/maze.map
%%DATADIR%%/maps/pattern.map
%%DATADIR%%/maps/small.map
@@ -15,7 +8,7 @@
%%DATADIR%%/scheme/simple.scm
%%DATADIR%%/scheme/stop.scm
%%DATADIR%%/scheme/zap.scm
+share/pixmaps/gnurobots.png
@dirrm %%DATADIR%%/scheme
@dirrm %%DATADIR%%/maps
@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- gnurobots-1.2.0_9.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?20121130201507.A5480A0B>