Bug 182517 - [PATCH] graphics/py27-pyglet: Support STAGEDIR, add Demos
Summary: [PATCH] graphics/py27-pyglet: Support STAGEDIR, add Demos
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: Dmitry Marakasov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-09-30 18:00 UTC by Rusmir Dusko
Modified: 2014-01-24 01:30 UTC (History)
1 user (show)

See Also:


Attachments
py27-pyglet-1.1.4_1.patch (5.12 KB, patch)
2013-09-30 18:00 UTC, Rusmir Dusko
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Rusmir Dusko freebsd_committer freebsd_triage 2013-09-30 18:00:00 UTC
- Bump PORTREVISION
- Add license (BSD)
- Use the new format for LIB_DEPENDS
- Add dependency for multimedia/avbin
- Change docs and add DEMOS, DOCS and EXAMPLES Option
- Add DEMOS to default Options
- Support STAGEDIR and add OPTIONS_SUB
- Remove IGNORE for not i386
- Add demos Astraea and Noisy, add Icons, Desktop entry files
- Add REINPLACE_CMD
- Add pkg-message to display demos usage
- Change pkg-plist add demos


Port maintainer (amdmi3@FreeBSD.org) is cc'd.

Generated and tested manually, tested with stage and with RedPorts, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)

How-To-Repeat: 
Build log

https://redports.org/buildarchive/20130930133900-45408/


From Upstream

http://pyglet.org/

Pyglet now also runs on 64-bit operating systems Linux, Windows and OS X.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-09-30 18:00:09 UTC
Responsible Changed
From-To: freebsd-ports-bugs->amdmi3

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-10-30 00:46:13 UTC
Author: nemysis
Date: Wed Oct 30 00:46:05 2013
New Revision: 332027
URL: http://svnweb.freebsd.org/changeset/ports/332027

Log:
  - Bump PORTREVISION
  - Add license (BSD)
  - Use the new format for LIB_DEPENDS
  - Add dependency for multimedia/avbin
  - Change DOCS and add DEMOS, add DOCS and EXAMPLES Options
  - Add DEMOS to default Options
  - Support STAGEDIR and add OPTIONS_SUB
  - Remove IGNORE for not i386
  - Add demos Astraea and Noisy, add Icons, Desktop entry files
  - Add pkg-message to display demos usage
  - Change pkg-plist, add demos
  
  PR:		ports/182517
  Submitted by:	nemysis (self)
  Approved by:	pawel / wg (mentors, implicit), maintainer timeout

Added:
  head/graphics/py-pyglet/files/
  head/graphics/py-pyglet/files/pkg-message.in   (contents, props changed)
  head/graphics/py-pyglet/files/pyglet-astraea.in   (contents, props changed)
  head/graphics/py-pyglet/files/pyglet-noisy.in   (contents, props changed)
Modified:
  head/graphics/py-pyglet/Makefile   (contents, props changed)
  head/graphics/py-pyglet/pkg-plist   (contents, props changed)

Modified: head/graphics/py-pyglet/Makefile
==============================================================================
--- head/graphics/py-pyglet/Makefile	Wed Oct 30 00:03:06 2013	(r332026)
+++ head/graphics/py-pyglet/Makefile	Wed Oct 30 00:46:05 2013	(r332027)
@@ -3,6 +3,7 @@
 
 PORTNAME=	pyglet
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	graphics multimedia x11-toolkits python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,8 +11,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Cross-platform windowing and multimedia library for Python
 
-LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
+LICENSE=	BSD
+
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	avbin>=0:${PORTSDIR}/multimedia/avbin
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
@@ -19,23 +23,52 @@ USE_GL=		gl glu
 USE_OPENAL=	al
 
 PORTDOCS=	*
+
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	CHANGELOG NOTICE README
+
+DOCSRCDIR2=	${WRKSRC}/doc
+DOCSDIR2=	${DOCSDIR}/doc
+
 PORTEXAMPLES=	*
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+OPTIONS_GROUP=	DEMOS_EXAMPLES
+OPTIONS_GROUP_DEMOS_EXAMPLES=	DEMOS EXAMPLES
+OPTIONS_DEFAULT=	DEMOS
+DEMOS_DESC=	Install Demos programs, requires EXAMPLES
+
+OPTIONS_SUB=	yes
+
 .include <bsd.port.options.mk>
 
-.if ${ARCH} != "i386"
-IGNORE=		crashes or doesn't work on !i386
+.if ${PORT_OPTIONS:MDEMOS} && ${PORT_OPTIONS:MEXAMPLES}
+SUB_FILES+=	pkg-message pyglet-astraea pyglet-noisy
+DESKTOP_ENTRIES+="Astraea" "A sprite-based game loosely based on the classic Asteroids" "pyglet-astraea" \
+		"pyglet-astraea" "Game;ArcadeGame;" false
+DESKTOP_ENTRIES+="Noisy" "Bounces balls around a window and plays noises" "pyglet-noisy" \
+		"pyglet-noisy" "Game;ArcadeGame;" false
+# Sound Space not works, needs working AVbin
 .endif
 
+post-patch:
+	@${FIND} ${WRKSRC} -name '*.py' | ${XARGS} \
+		${REINPLACE_CMD} -e 's|/usr/include|${PREFIX}/include|g'
+	@${FIND} ${WRKSRC} -name "*.bak" -delete
+
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR2})
+
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+
+.if ${PORT_OPTIONS:MDEMOS} && ${PORT_OPTIONS:MEXAMPLES}
+	${INSTALL_SCRIPT} ${WRKDIR}/pyglet-astraea ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKDIR}/pyglet-noisy ${STAGEDIR}${PREFIX}/bin/
+	${LN} -sf ${EXAMPLESDIR}/astraea/res/asteroid2.png ${STAGEDIR}${PREFIX}/share/pixmaps/pyglet-astraea.png
+	${LN} -sf ${EXAMPLESDIR}/noisy/ball.png ${STAGEDIR}${PREFIX}/share/pixmaps/pyglet-noisy.png
 .endif
 
 .include <bsd.port.mk>

Added: head/graphics/py-pyglet/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/py-pyglet/files/pkg-message.in	Wed Oct 30 00:46:05 2013	(r332027)
@@ -0,0 +1,26 @@
+===============================================================================
+
+pyglet has been installed.
+
+pyglet have more Demos (Games)
+
+Astraea, Noisy
+
+
+You can use executable
+
+    %%LOCALBASE%%/bin/pyglet-astraea
+
+    %%LOCALBASE%%/bin/pyglet-noisy
+
+
+Or can use desktop files
+
+    %%LOCALBASE%%/share/applications/pyglet-astraea.desktop
+
+    %%LOCALBASE%%/share/applications/pyglet-noisy.desktop
+
+
+Have fun!
+
+===============================================================================

Added: head/graphics/py-pyglet/files/pyglet-astraea.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/py-pyglet/files/pyglet-astraea.in	Wed Oct 30 00:46:05 2013	(r332027)
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# # $FreeBSD$
+#
+
+cd "%%EXAMPLESDIR%%/astraea"
+exec /usr/bin/env python ./astraea.py "${@}"

Added: head/graphics/py-pyglet/files/pyglet-noisy.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/py-pyglet/files/pyglet-noisy.in	Wed Oct 30 00:46:05 2013	(r332027)
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# # $FreeBSD$
+#
+
+cd "%%EXAMPLESDIR%%/noisy"
+exec /usr/bin/env python ./noisy.py "${@}"

Modified: head/graphics/py-pyglet/pkg-plist
==============================================================================
--- head/graphics/py-pyglet/pkg-plist	Wed Oct 30 00:03:06 2013	(r332026)
+++ head/graphics/py-pyglet/pkg-plist	Wed Oct 30 00:46:05 2013	(r332027)
@@ -1,3 +1,5 @@
+%%DEMOS%%bin/pyglet-astraea
+%%DEMOS%%bin/pyglet-noisy
 %%PYTHON_SITELIBDIR%%/pyglet/__init__.py
 %%PYTHON_SITELIBDIR%%/pyglet/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pyglet/__init__.pyo
@@ -295,6 +297,8 @@
 %%PYTHON_SITELIBDIR%%/pyglet/window/xlib/xsync.py
 %%PYTHON_SITELIBDIR%%/pyglet/window/xlib/xsync.pyc
 %%PYTHON_SITELIBDIR%%/pyglet/window/xlib/xsync.pyo
+%%DEMOS%%share/pixmaps/pyglet-astraea.png
+%%DEMOS%%share/pixmaps/pyglet-noisy.png
 @dirrm %%PYTHON_SITELIBDIR%%/pyglet/window/xlib
 @dirrm %%PYTHON_SITELIBDIR%%/pyglet/window/win32
 @dirrm %%PYTHON_SITELIBDIR%%/pyglet/window/carbon
_______________________________________________
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 3 Rusmir Dusko freebsd_committer freebsd_triage 2013-10-30 00:49:53 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 Dmitry Marakasov freebsd_committer freebsd_triage 2013-10-30 14:24:44 UTC
State Changed
From-To: closed->open

Reopen, commit was reverted
Comment 5 dfilter service freebsd_committer freebsd_triage 2014-01-24 01:25:45 UTC
Author: amdmi3
Date: Fri Jan 24 01:25:37 2014
New Revision: 340875
URL: http://svnweb.freebsd.org/changeset/ports/340875
QAT: https://qat.redports.org/buildarchive/r340875/

Log:
  - Add dependency on avbin
  - Install more docs
  
  PR:		182517
  Submitted by:	nemysis

Modified:
  head/graphics/py-pyglet/Makefile

Modified: head/graphics/py-pyglet/Makefile
==============================================================================
--- head/graphics/py-pyglet/Makefile	Fri Jan 24 01:22:59 2014	(r340874)
+++ head/graphics/py-pyglet/Makefile	Fri Jan 24 01:25:37 2014	(r340875)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pyglet
 PORTVERSION=	1.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics multimedia x11-toolkits python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,8 @@ COMMENT=	Cross-platform windowing and mu
 LICENSE=	BSD
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+RUN_DEPENDS=	${LOCALBASE}/lib/libavbin.so:${PORTSDIR}/multimedia/avbin
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
@@ -33,6 +34,8 @@ IGNORE=		crashes or doesn't work on !i38
 .endif
 
 post-install:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} CHANGELOG NOTICE README ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/
 
_______________________________________________
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 Dmitry Marakasov freebsd_committer freebsd_triage 2014-01-24 01:27:20 UTC
State Changed
From-To: open->closed

Committed.  Thanks!  Didn't commit demos - they should not be installed 
by the port. Astraea though, being useful as a standalone game, may be 
submitted as a separate port under games category.