Make use of MODPY_EGG_VERSION.

Do not hardcode python lib in WANTLIB, use MODPY_WANTLIB.
MODPY_BIN is already part of SUBST_VARS by default.
Unbreak runtime: MODPYTHON_BIN -> MODPY_BIN
This commit is contained in:
ajacoutot 2013-02-02 08:14:49 +00:00
parent 401ab3e058
commit 89b47042b2
3 changed files with 7 additions and 6 deletions

View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/02/02 03:09:08 bentley Exp $
# $OpenBSD: Makefile,v 1.2 2013/02/02 08:14:49 ajacoutot Exp $
COMMENT = visual novel engine
V = 6.14.1
MODPY_EGG_VERSION = ${V}.366
DISTNAME = renpy-${V}-source
PKGNAME = ${DISTNAME:S/-source//}
REVISION = 0
CATEGORIES = games
@ -17,7 +19,7 @@ PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += GLEW SDL avcodec avformat avutil freetype fribidi m
WANTLIB += png pthread python2.7 swscale z
WANTLIB += png pthread ${MODPY_WANTLIB} swscale z
MASTER_SITES = http://www.renpy.org/dl/${V}/
EXTRACT_SUFX = .tar.bz2
@ -38,7 +40,6 @@ NO_REGRESS = Yes
WRKSRC = ${WRKDIST}/module
MODPY_ADJ_FILES = ../renpy.py
SUBST_VARS += MODPY_BIN
pre-install:
rm ${WRKDIST}/launcher/game/project.rpy.orig

View File

@ -1,3 +1,3 @@
#!/bin/sh
cd ${TRUEPREFIX}/share/renpy/ && ${MODPYTHON_BIN} ./renpy.py "$@"
cd ${TRUEPREFIX}/share/renpy/ && ${MODPY_BIN} ./renpy.py "$@"

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/02/02 03:09:09 bentley Exp $
@comment $OpenBSD: PLIST,v 1.2 2013/02/02 08:14:49 ajacoutot Exp $
bin/renpy
lib/python${MODPY_VERSION}/site-packages/Ren_Py-6.14.1.366-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/Ren_Py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/_renpy.so
lib/python${MODPY_VERSION}/site-packages/_renpy_font.so
lib/python${MODPY_VERSION}/site-packages/_renpybidi.so