Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Oct 2012 10:10:13 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        jgh@FreeBSD.org
Subject:   ports/173184: [PATCH] games/abe: Makefile changed, removed pkg-plist, take maintainership
Message-ID:  <20121029091017.B1B60987@hub.freebsd.org>
Resent-Message-ID: <201210290920.q9T9K07D000396@freefall.freebsd.org>

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

>Number:         173184
>Category:       ports
>Synopsis:       [PATCH] games/abe: Makefile changed, removed pkg-plist, 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 Oct 29 09: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

Removed file(s):
- pkg-plist

Makefile changed:

+BUILD_DEPENDS=	bmptopnm:${PORTSDIR}/graphics/netpbm
+PLIST_FILES=
+PORTDATA=	*
+PORTDOCS=
+DESKTOP_ENTRIES=
+post-build:
+post-install:
+.if ${PORT_OPTIONS:MDOCS}

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

portlint -A
looks fine.

port test: clean

Build log

https://redports.org/buildarchive/20121029030110-48809/

>Fix:

--- abe-1.1_6.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/abe/Makefile ./Makefile
--- /usr/ports/games/abe/Makefile	2012-08-24 04:36:17.000000000 +0200
+++ ./Makefile	2012-10-29 04:15:05.000000000 +0100
@@ -7,38 +7,42 @@
 
 PORTNAME=	abe
 PORTVERSION=	1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Abe's Amazing Adventure
 
 LICENSE=	GPLv2
 
-USE_GMAKE=	yes
-USE_SDL=	mixer sdl
+BUILD_DEPENDS=	bmptopnm:${PORTSDIR}/graphics/netpbm
 
+USE_SDL=	mixer sdl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-data-dir=${DATADIR}
+USE_GMAKE=	yes
 
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
+PLIST_FILES=	bin/${PORTNAME} \
+		share/pixmaps/${PORTNAME}.png
+
+PORTDATA=	*
+PORTDOCS=	AUTHORS ChangeLog README
+
+DESKTOP_ENTRIES="Abe's Amazing Avanture" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
+
 OPTIONS_DEFINE=	GOD_MODE OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
 GOD_MODE_DESC=	Enable God Mode (toggle with 'g')
 
-post-install:
-	@${MKDIR} ${DATADIR}
-.for d in images maps sounds
-	@${CP} -R ${WRKSRC}/${d} ${DATADIR}
-.endfor
-
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MGOD_MODE} || !empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
 post-patch:
+.if ${PORT_OPTIONS:MGOD_MODE} || !empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
 .   if ${PORT_OPTIONS:MGOD_MODE}
 	@${REINPLACE_CMD} -e 's|\(#define GOD_MODE\) 0|\1 1|' \
 		${WRKSRC}/src/Game.h
@@ -52,4 +56,22 @@
 .   endif
 .endif
 
+post-build:
+	@(cd ${WRKSRC} && ${TAR} xf ./images/images.tar abe.bmp && \
+		${LOCALBASE}/bin/bmptopnm abe.bmp | \
+		${LOCALBASE}/bin/pamscale .2487 | ${LOCALBASE}/bin/pnmtopng > ${PORTNAME}.png)
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps
+
+	${MKDIR} ${DATADIR}
+.for d in images maps sounds
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
+.endfor
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/abe/pkg-plist ./pkg-plist
--- /usr/ports/games/abe/pkg-plist	2005-07-20 20:31:26.000000000 +0200
+++ ./pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-bin/abe
-%%DATADIR%%/images/images.tar
-%%DATADIR%%/maps/default.dat
-%%DATADIR%%/maps/intro.dat
-%%DATADIR%%/sounds/bubble.wav
-%%DATADIR%%/sounds/closed.wav
-%%DATADIR%%/sounds/death.wav
-%%DATADIR%%/sounds/door.wav
-%%DATADIR%%/sounds/game.ogg
-%%DATADIR%%/sounds/gem.wav
-%%DATADIR%%/sounds/intro.ogg
-%%DATADIR%%/sounds/jump.wav
-%%DATADIR%%/sounds/menu.wav
-%%DATADIR%%/sounds/object.wav
-%%DATADIR%%/sounds/platform.wav
-%%DATADIR%%/sounds/pop.wav
-%%DATADIR%%/sounds/spring.wav
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/maps
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%
--- abe-1.1_6.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?20121029091017.B1B60987>