Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Nov 2013 20:37:33 +0000 (UTC)
From:      Rusmir Dusko <nemysis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334261 - head/games/3dpong
Message-ID:  <201311182037.rAIKbX3b058022@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nemysis
Date: Mon Nov 18 20:37:33 2013
New Revision: 334261
URL: http://svnweb.freebsd.org/changeset/ports/334261

Log:
  - Change master sites
  - Change maintainer email to @FreeBSD.org
  - USES gmake instead of USE_GMAKE
  - Add DOCS and EXAMPLES Options
  - Support STAGEDIR
  - Use pkg-plist instead of PLIST_FILES and PLIST_DIRS
  
  Approved by:	pawel / wg (mentors, implicit)

Added:
  head/games/3dpong/pkg-plist   (contents, props changed)
Modified:
  head/games/3dpong/Makefile

Modified: head/games/3dpong/Makefile
==============================================================================
--- head/games/3dpong/Makefile	Mon Nov 18 20:34:39 2013	(r334260)
+++ head/games/3dpong/Makefile	Mon Nov 18 20:37:33 2013	(r334261)
@@ -6,58 +6,44 @@ PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/3dpong/src/ \
 		ftp://ftp.billsgames.com/unix/x/3dpong/src/ \
-		SF/nemysisfreebsdp/:icons
+		SF/nemysisfreebsdp/${CATEGORIES}/:icons
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	X Window 3D Pong game for 1 or 2 players
 
 LICENSE=	GPLv2
 
+USES=		gmake
 USE_XORG=	x11
-USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		XLIB="-L${LOCALBASE}/lib -lX11"
 
-MAN6=		${PORTNAME}.6
-
-PLIST_FILES=	bin/${PORTNAME} \
-		share/pixmaps/${PORTNAME}.png \
-		%%DATADIR%%/hit.au \
-		%%DATADIR%%/score.au \
-		%%DATADIR%%/wall.au
-PLIST_DIRS=	%%DATADIR%%
-
 PORTDOCS=	AUTHORS.txt CHANGES.txt README.txt TODO.txt
 PORTEXAMPLES=	*
 
 DESKTOP_ENTRIES="3D Pong" "${COMMENT}" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" false
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|cat sounds/|cat ${DATADIR}/|g' ${WRKSRC}/src/3dpong.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/sounds/*.au ${STAGEDIR}${DATADIR}
+	${INSTALL_MAN} ${WRKSRC}/src/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
 
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/sounds/*.au ${DATADIR}
-	${INSTALL_MAN} ${WRKSRC}/src/${MAN6} ${MAN6PREFIX}/man/man6
-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}
-.endif
-
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
-.endif
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>

Added: head/games/3dpong/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/3dpong/pkg-plist	Mon Nov 18 20:37:33 2013	(r334261)
@@ -0,0 +1,7 @@
+bin/3dpong
+man/man6/3dpong.6.gz
+%%DATADIR%%/hit.au
+%%DATADIR%%/score.au
+%%DATADIR%%/wall.au
+share/pixmaps/3dpong.png
+@dirrm %%DATADIR%%



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