Bug 170478 - [MAINTAINER] games/pycadia: Makefile changed, new Options, added files/pycadia.sh.in
Summary: [MAINTAINER] games/pycadia: Makefile changed, new Options, added files/pycadi...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Jason Helfman
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-08-08 14:40 UTC by nemysis
Modified: 2012-10-06 06:40 UTC (History)
0 users

See Also:


Attachments
pycadia-0.5.1.patch (1.84 KB, patch)
2012-08-08 14:40 UTC, nemysis
no flags Details | Diff
pycadia.diff (981 bytes, patch)
2012-08-18 14:03 UTC, nemysis
no flags Details | Diff
pycadia.diff (1.97 KB, patch)
2012-08-20 19:38 UTC, nemysis
no flags Details | Diff
pycadia.diff (3.35 KB, patch)
2012-09-14 14:00 UTC, nemysis
no flags Details | Diff
pycadia.diff (3.21 KB, patch)
2012-09-28 01:31 UTC, nemysis
no flags Details | Diff
pycadia.diff (3.15 KB, patch)
2012-10-02 16:41 UTC, nemysis
no flags Details | Diff
pycadia.diff (3.15 KB, patch)
2012-10-04 02:25 UTC, nemysis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2012-08-08 14:40:01 UTC
Makefile changed:

Changed in Makefile for all ${PORTNAME}

Removed unsafe Script pycadia.sh


New Options for Makefile

SUB_FILES=	${PORTNAME}.sh

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MDATA}

.if ${PORT_OPTIONS:MDOCS}

Added file(s):
- files/pycadia.sh.in

Must use Name pycadia.sh.in not pycadia.in why is Work directory pycadia.

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
Comment 1 Jason Helfman freebsd_committer freebsd_triage 2012-08-08 21:55:34 UTC
Responsible Changed
From-To: freebsd-ports-bugs->jgh

I'll take it.
Comment 2 nemysis 2012-09-14 14:00:08 UTC
Added

DESKTOP_ENTRIES=


Changed

@(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR})
Comment 3 nemysis 2012-10-02 16:41:14 UTC
Changed to

DESKTOP_ENTRIES="Pycadia" "${COMMENT}" "${PORTNAME}" \
                "${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
Comment 4 nemysis 2012-10-04 02:25:19 UTC
Added

USE_GNOME=      pygtk2 libgnomeui
Comment 5 dfilter service freebsd_committer freebsd_triage 2012-10-06 06:37:38 UTC
Author: jgh
Date: Sat Oct  6 05:37:29 2012
New Revision: 305338
URL: http://svn.freebsd.org/changeset/ports/305338

Log:
  - adjust dependencies
  - install target cleanup
  - use optionsNG for DOCS
  
  PR:		170478
  Submitted by:	maintainer, nemysis@gmx.ch

Added:
  head/games/pycadia/files/pycadia.sh.in   (contents, props changed)
Modified:
  head/games/pycadia/Makefile
  head/games/pycadia/distinfo   (contents, props changed)

Modified: head/games/pycadia/Makefile
==============================================================================
--- head/games/pycadia/Makefile	Sat Oct  6 05:08:03 2012	(r305337)
+++ head/games/pycadia/Makefile	Sat Oct  6 05:37:29 2012	(r305338)
@@ -1,55 +1,54 @@
-# New Ports collection makefile for:	Pycadia
-# Date created:		2012-05-09
-# Whom:			nemysis@gmx.ch
+# Created by:			nemysis@gmx.ch
 #
 # $FreeBSD$
-#
 
 PORTNAME=	pycadia
 PORTVERSION=	0.5.1
-CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GENTOO:S/%SUBDIR%/distfiles/}
+PORTREVISION=	1
+CATEGORIES=	games python
+MASTER_SITES=	${MASTER_SITE_GENTOO:S/%SUBDIR%/distfiles/} \
+		SF/nemysisfreebsdp/
+DIST_SUBDIR=	python
 
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Home to vector gaming, Python style
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
-		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
+RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USE_GNOME=	pygtk2 libgnomeui
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	bin/pycadia \
-		share/pixmaps/pycadia.png
+PLIST_FILES=	bin/${PORTNAME} \
+		share/pixmaps/${PORTNAME}.png
 
 PORTDATA=	*
-PORTDOCS=	CHANGELOG INSTALL README TODO gravity.txt
+PORTDOCS=	CHANGELOG README TODO gravity.txt
+
+DESKTOP_ENTRIES="Pycadia" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
+
+SUB_FILES=	${PORTNAME}.sh
+
+.include <bsd.port.options.mk>
 
 do-install:
-# Scripts
-	@${PRINTF} "#!/bin/sh\n\ncd ${DATADIR} &&\
-		./${PORTNAME}.py\n" > ${WRKDIR}/${PORTNAME}.sh
-	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
 
-# Data
-.if !defined (NOPORTDATA)
 	${MKDIR} ${DATADIR}
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "glade pixmaps sounds *.*" ${DATADIR})
-	@(cd ${DATADIR} && ${CHMOD} 755 pycadia.py spacewarpy.py vektoroids.py)
-	${INSTALL_DATA} ${FILESDIR}/pycadia.conf ${DATADIR}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR})
+	@(cd ${DATADIR} && ${CHMOD} 555 ${PORTNAME}.py spacewarpy.py vektoroids.py)
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf ${DATADIR}
+
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/logo1.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
-.endif
 
-# Documentation
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-.  for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
-.  endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/games/pycadia/distinfo
==============================================================================
--- head/games/pycadia/distinfo	Sat Oct  6 05:08:03 2012	(r305337)
+++ head/games/pycadia/distinfo	Sat Oct  6 05:37:29 2012	(r305338)
@@ -1,2 +1,2 @@
-SHA256 (pycadia-0.5.1.tar.gz) = c872e4aede8cd04773327308b38b7e85b06aa370facee1c7b912d9ea938f67b5
-SIZE (pycadia-0.5.1.tar.gz) = 2768619
+SHA256 (python/pycadia-0.5.1.tar.gz) = c872e4aede8cd04773327308b38b7e85b06aa370facee1c7b912d9ea938f67b5
+SIZE (python/pycadia-0.5.1.tar.gz) = 2768619

Added: head/games/pycadia/files/pycadia.sh.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/pycadia/files/pycadia.sh.in	Sat Oct  6 05:37:29 2012	(r305338)
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+cd "%%DATADIR%%"
+./pycadia.py
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Jason Helfman freebsd_committer freebsd_triage 2012-10-06 06:38:46 UTC
State Changed
From-To: open->closed

Committed. Thanks!