kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make it use PKG_SYSCONFDIR, install default configuration file, update TODO, change patches to obtain the result of PKG_SYSCONFIDIR

Browse source
This commit is contained in:
Michal Pasternak 2004-01-04 12:48:44 +00:00 committed by Thomas Klausner
parent 32cb34dbf6
commit 9efa0c93f4
6 changed files with 45 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
freevo/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2004/01/04 11:36:14 mpasternak Exp $
# $NetBSD: Makefile,v 1.4 2004/01/04 12:48:44 mpasternak Exp $
#
DISTNAME= freevo-1.4.1
@ -15,15 +15,29 @@ USE_BUILDLINK2= yes
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
PKG_SYSCONFSUBDIR= freevo
CONF_FILES= ${PKG_SYSCONFDIR}/local_conf.py
# well, this could be propably done better way I can't think of
# -- dotz@irc.pl
post-patch:
${CP} ${WRKSRC}/freevo ${WRKSRC}/freevo.pre
sed -e 's|@@PYTHONBIN@@|${PYTHONBIN}|g' < ${WRKSRC}/freevo.pre > \
${WRKSRC}/freevo
${CP} ${WRKSRC}/freevo ${WRKSRC}/freevo.pre
sed -e 's|@@PKG_SYSCONFDIR@@|${PKG_SYSCONFDIR}|g' < ${WRKSRC}/freevo.pre > \
${WRKSRC}/freevo
post-install:
${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
${INSTALL_DATA} ${WRKSRC}/local_conf.py.example \
${PKG_SYSCONFDIR}/local_conf.py
.include "../../wip/py-game/buildlink2.mk"
.include "../../wip/py-twisted/buildlink2.mk"
.include "../../wip/py-mmpython/buildlink2.mk"
.include "../../wip/py-xml/buildlink2.mk"
.include "../../textproc/pyxml/buildlink2.mk"
.include "../../graphics/py-imaging/buildlink2.mk"
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"

3
freevo/PLIST
View file

@ -1,5 +1,6 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/04 11:03:52 mpasternak Exp $
@comment $NetBSD: PLIST,v 1.2 2004/01/04 12:48:44 mpasternak Exp $
bin/freevo
${PKG_SYSCONFDIR}/local_config.py
${PYSITELIB}/freevo/__init__.py
${PYSITELIB}/freevo/__init__.pyc
${PYSITELIB}/freevo/__init__.pyo

7
freevo/TODO
View file

@ -1,11 +1,16 @@
$Id: TODO,v 1.4 2004/01/04 11:45:04 mpasternak Exp $
$Id: TODO,v 1.5 2004/01/04 12:48:44 mpasternak Exp $
Check the fantastic PLIST twice. You can even sort it.
Check if my fantastic local_config.py.example -> etc/freevo/local_config.py
is done the right way.
E-mail:
http://sourceforge.net/mail/?group_id=46652
and ask for NetBSD (pkgsrc) package placement at:
http://freevo.sourceforge.net/install.html
_when_ it works. No earlier.
Current crash reason: pygame draw module not available (on fbsd at least)
-- dotz@irc.pl

6
freevo/distinfo
View file

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.4 2004/01/04 11:55:15 mpasternak Exp $
$NetBSD: distinfo,v 1.5 2004/01/04 12:48:44 mpasternak Exp $
SHA1 (freevo-1.4.1.tar.gz) = a1fc8b767cc63625e440b381f37f78c8a3bd3349
Size (freevo-1.4.1.tar.gz) = 3107468 bytes
SHA1 (patch-aa) = e223a1d2ec32ff8cb5e4281daa13d8ed8707c10f
SHA1 (patch-ab) = 114288a54f6de5485a0addf2c99bc191d457679c
SHA1 (patch-aa) = 7ce13beb856ebd2cd305bf0e9f12c6557b310fcd
SHA1 (patch-ab) = 5941390b4d94f3f84ea3fc79103fe3bf5f5f003a
SHA1 (patch-ac) = a25bc4af003b8b2c7616f0a096d840416f4f53c9
SHA1 (patch-ad) = 8ce9e7db4fb2b1730cfcc81cb60af3ffab5076af
SHA1 (patch-ae) = d857ca9409764ea57b7836b2d45f8849e04b57ed

11
freevo/patches/patch-aa
View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.1 2004/01/04 11:12:55 mpasternak Exp $
$NetBSD: patch-aa,v 1.2 2004/01/04 12:48:44 mpasternak Exp $
--- freevo~ Thu Nov 20 19:16:40 2003
+++ freevo Sun Jan 4 11:07:57 2004
@@ -142,15 +142,7 @@
--- freevo.orig Thu Nov 20 19:16:40 2003
+++ freevo Sun Jan 4 12:36:25 2004
@@ -142,15 +142,10 @@
export RUNAPP=""
# search for the correct Python binary
@ -16,6 +16,9 @@ $NetBSD: patch-aa,v 1.1 2004/01/04 11:12:55 mpasternak Exp $
- done
-done
+PYTHON=@@PYTHONBIN@@
+
+# make it pkgsrc-compatbile
+export PKGSRC_SYSCONF_DIR=@@PKGSRC_SYSCONF_DIR@@
# Check the environment we started in. There are three choices:
# o installed into the system

13
freevo/patches/patch-ab
View file

@ -1,7 +1,7 @@
$NetBSD: patch-ab,v 1.1 2004/01/04 11:45:04 mpasternak Exp $
$NetBSD: patch-ab,v 1.2 2004/01/04 12:48:44 mpasternak Exp $
--- src/config.py.orig Sun Dec 14 16:54:14 2003
+++ src/config.py Sun Jan 4 11:44:45 2004
+++ src/config.py Sun Jan 4 12:35:21 2004
@@ -95,7 +95,8 @@
import __builtin__
import version
@ -21,3 +21,12 @@ $NetBSD: patch-ab,v 1.1 2004/01/04 11:45:04 mpasternak Exp $
__builtin__.__dict__['True'] = 1
__builtin__.__dict__['False'] = 0
@@ -318,7 +319,7 @@
#
# Config file handling
#
-cfgfilepath = [ '.', os.path.expanduser('~/.freevo'), '/etc/freevo',
+cfgfilepath = [ '.', os.path.expanduser('~/.freevo'), os.path.join(os.environ.get("PKGSRC_SYSCONF_DIR", "/usr/pkg/etc"), "freevo"), '/etc/freevo',
'/usr/local/etc/freevo' ]