Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Nov 2012 21:21:16 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/173876: [PATCH] games/gtkballs: Added License, OptionsNG, Desktop entries, take maintainership
Message-ID:  <20121123202120.20C135FF@hub.freebsd.org>
Resent-Message-ID: <201211232030.qANKU0pM095007@freefall.freebsd.org>

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

>Number:         173876
>Category:       ports
>Synopsis:       [PATCH] games/gtkballs: Added License, OptionsNG, Desktop entries, 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 23 20:30: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

Makefile changed:
+LICENSE=	GPLv2
+CONFIGURE_ARGS=	--localstatedir=/var/games
+PORTDOCS=
+DESKTOP_ENTRIES=
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MNLS}
+post-patch:

Changed and refined:
 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
WARN: Makefile: [47]: use ${VARIABLE}, instead of $(VARIABLE).

WARN: Makefile: [47]: because is used
+	's|$$(INSTALL_DATA) COPYING $$(DESTDIR)$$(datadir)/gtkballs||' \

port test: clean

Can't give build log, because RedPorts not works at the time.

>Fix:

--- gtkballs-3.1.5_12.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/gtkballs/Makefile ./Makefile
--- /usr/ports/games/gtkballs/Makefile	2012-11-16 09:01:48.000000000 +0100
+++ ./Makefile	2012-11-15 21:11:41.000000000 +0100
@@ -2,38 +2,56 @@
 # Date created:				11 November 1998
 # Whom:					Andrey Zakhvatov
 #
-# $FreeBSD: head/games/gtkballs/Makefile 300896 2012-07-14 13:54:48Z beat $
+# $FreeBSD: ports/games/gtkballs/Makefile,v 1.47 2012/06/01 05:18:51 dinoex Exp $
 #
 
 PORTNAME=	gtkballs
 PORTVERSION=	3.1.5
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	http://gtkballs.antex.ru/dist/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Lines-like simple logic game for X Window System
 
-USE_GETTEXT=	yes
+LICENSE=	GPLv2
+
 USE_GNOME=	gtk20
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--localstatedir=/var/games
+USE_GMAKE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--localstatedir=${DATADIR}
 
 MAN6=		gtkballs.6x
 
+PORTDOCS=	AUTHORS ChangeLog NEWS README README.russian TODO
+
+DESKTOP_ENTRIES="GtkBalls" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} \
+	's|$$(INSTALL_DATA) COPYING $$(DESTDIR)$$(datadir)/gtkballs||' \
+		${WRKSRC}/Makefile.in
+
 post-install:
-	${CHMOD} 2755 ${PREFIX}/bin/gtkballs
-	${CHOWN} root:games ${PREFIX}/bin/gtkballs
-	${CHMOD} 0664 ${DATADIR}/gtkballs-scores
-	${CHOWN} root:games ${DATADIR}/gtkballs-scores
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in README README.russian TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/gnome-gtkballs.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/gtkballs/pkg-descr ./pkg-descr
--- /usr/ports/games/gtkballs/pkg-descr	2012-11-16 09:01:48.000000000 +0100
+++ ./pkg-descr	2012-11-15 17:13:17.000000000 +0100
@@ -1,4 +1,4 @@
-It's an old game of balls where your goal is to remove as many
-balls from the game field as you can.
+It's an old DOS game Color Lines with balls where your goal is to remove
+as many balls from the game field as you can.
 
 WWW: http://gtkballs.antex.ru/
diff -ruN --exclude=CVS /usr/ports/games/gtkballs/pkg-plist ./pkg-plist
--- /usr/ports/games/gtkballs/pkg-plist	2012-11-16 09:01:48.000000000 +0100
+++ ./pkg-plist	2012-11-15 20:52:24.000000000 +0100
@@ -1,10 +1,5 @@
 bin/gtkballs
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.russian
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%DATADIR%%/COPYING
 %%DATADIR%%/gtkballs-logo.png
-%%DATADIR%%/gtkballs-scores
 %%DATADIR%%/gtkballs_16x16.png
 %%DATADIR%%/themes/5balls-Big/blue.xpm
 %%DATADIR%%/themes/5balls-Big/blue_destroy1.xpm
@@ -526,14 +521,14 @@
 %%DATADIR%%/themes/mascots/walk7.xpm
 %%DATADIR%%/themes/mascots/walk8.xpm
 %%DATADIR%%/themes/mascots/walk_small.xpm
-share/locale/de/LC_MESSAGES/gtkballs.mo
-share/locale/fr/LC_MESSAGES/gtkballs.mo
-share/locale/pl/LC_MESSAGES/gtkballs.mo
-share/locale/ru/LC_MESSAGES/gtkballs.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gtkballs.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gtkballs.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gtkballs.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gtkballs.mo
+share/pixmaps/gtkballs.png
 @dirrm %%DATADIR%%/themes/mascots
 @dirrm %%DATADIR%%/themes/klines
 @dirrm %%DATADIR%%/themes/Default
 @dirrm %%DATADIR%%/themes/5balls-Big
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- gtkballs-3.1.5_12.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?20121123202120.20C135FF>