Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 03 Dec 2012 01:30:52 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/174069: [PATCH] misc/explosions: OptionsNG, added categories, licence, icon, desktop entry, take maintainership
Message-ID:  <20121203003055.7E08795E@hub.freebsd.org>
Resent-Message-ID: <201212030040.qB30e1Si089899@freefall.freebsd.org>

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

>Number:         174069
>Category:       ports
>Synopsis:       [PATCH] misc/explosions: OptionsNG, added categories, licence, icon, desktop entry, 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:   Mon Dec 03 00:40:01 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:
+CATEGORIES=	misc games graphics
+MASTER_SITES=
+DISTFILES=
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION:S/^0.//}${EXTRACT_SUFX}
+LICENSE=	GPLv2
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/^0.//}
+PORTDOCS=	BUGS.txt CHANGES.txt README.txt
+DESKTOP_ENTRIES=
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MDOCS}

Removed not needed use for sed only ${REINPLACE_CMD}
-USE_PERL5_BUILD=yes

Changed and refined:
 post-patch:
 do-install:
 pkg-descr
 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:

--- explosions-0.2005.07.31_13.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/misc/explosions/Makefile ./Makefile
--- /usr/ports/misc/explosions/Makefile	2012-11-16 09:03:18.000000000 +0100
+++ ./Makefile	2012-12-03 01:23:24.000000000 +0100
@@ -7,34 +7,50 @@
 
 PORTNAME=	explosions
 PORTVERSION=	0.2005.07.31
-PORTREVISION=	12
-CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.billsgames.com/unix/x/explosions/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/^0.//}
+PORTREVISION=	13
+CATEGORIES=	misc games graphics
+MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/explosions/ \
+		ftp://ftp.billsgames.com/unix/x/explosions/ \
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION:S/^0.//}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION:S/^0.//}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	3D objects flying around resembling explosions with various effects
 
+LICENSE=	GPLv2
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/^0.//}
+
 USE_SDL=	sdl image
 USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
+
+PORTDOCS=	BUGS.txt CHANGES.txt README.txt
+
+DESKTOP_ENTRIES="Explosions" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Application;Game;Graphics;" ${FALSE}
+
+.include <bsd.port.options.mk>
 
 post-patch:
-	@${PERL} -pi -e 's!CFLAGS=-Wall -O2!CFLAGS+=-Wall!; \
-		s!sdl-config!${SDL_CONFIG}!' \
+	@${REINPLACE_CMD} \
+	-e 's|CFLAGS=-Wall -O2|CFLAGS=-Wall|' \
+	-e 's|sdl-config|${SDL_CONFIG}|g' \
 		${WRKSRC}/Makefile
-	@${PERL} -pi -e 's!spark%d.png!${DATADIR}/spark%d.png!' \
+	@${REINPLACE_CMD} -e 's|spark%d.png|${DATADIR}/spark%d.png|' \
 		${WRKSRC}/explosions.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/explosions ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/spark?.png ${DATADIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in BUGS.txt CHANGES.txt README.txt
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.png ${DATADIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/misc/explosions/distinfo ./distinfo
--- /usr/ports/misc/explosions/distinfo	2012-11-16 09:03:18.000000000 +0100
+++ ./distinfo	2012-12-03 00:58:34.000000000 +0100
@@ -1,2 +1,4 @@
-SHA256 (explosions-2005.07.31.tar.gz) = 8203ed455caee9c0ad0e75b31462bb7c7a9c2860079deb7671c914d5cde37ae8
-SIZE (explosions-2005.07.31.tar.gz) = 40219
+SHA256 (explosions/explosions-2005.07.31.tar.gz) = 8203ed455caee9c0ad0e75b31462bb7c7a9c2860079deb7671c914d5cde37ae8
+SIZE (explosions/explosions-2005.07.31.tar.gz) = 40219
+SHA256 (explosions/explosions.png) = 3f5c330d41b5bf46598a00f8d75ebbe2bfa08bbbb9a649f0e96833331d727a87
+SIZE (explosions/explosions.png) = 1740
diff -ruN --exclude=CVS /usr/ports/misc/explosions/pkg-descr ./pkg-descr
--- /usr/ports/misc/explosions/pkg-descr	2012-11-16 09:03:18.000000000 +0100
+++ ./pkg-descr	2012-12-03 01:13:32.000000000 +0100
@@ -1,9 +1,8 @@
-This is a simplified 3D world with alpha-blended objects that look
-kind of like fireworks or sparks. It also has a number of effects
-built in, such as fading, blurring, fire ("heat"), and zooming.
+Explosions is a simplified 3D world with alpha-blended objects that look
+kind of like fireworks or sparks. It also has a number of effects built in,
+such as fading, blurring, fire ("heat"), and zooming.
 
 It serves no purpose except to look pretty. The source-code is also
-well-documented, so someone might find it useful in learning SDL
-routines.
-
+well-documented, so someone might find it useful in learning SDL routines.
+ 
 WWW: http://www.newbreedsoftware.com/lab/explosions/
diff -ruN --exclude=CVS /usr/ports/misc/explosions/pkg-plist ./pkg-plist
--- /usr/ports/misc/explosions/pkg-plist	2012-11-16 09:03:18.000000000 +0100
+++ ./pkg-plist	2012-12-03 01:01:12.000000000 +0100
@@ -1,7 +1,4 @@
 bin/explosions
-%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%DATADIR%%/spark1.png
 %%DATADIR%%/spark2.png
 %%DATADIR%%/spark3.png
@@ -9,5 +6,5 @@
 %%DATADIR%%/spark5.png
 %%DATADIR%%/spark6.png
 %%DATADIR%%/spark7.png
+share/pixmaps/explosions.png
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- explosions-0.2005.07.31_13.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?20121203003055.7E08795E>