Index: head/audio/py-xmms/Makefile =================================================================== --- head/audio/py-xmms/Makefile (revision 58530) +++ head/audio/py-xmms/Makefile (revision 58531) @@ -1,28 +1,28 @@ # New ports collection makefile for: py-xmms # Date created: 19 March 2002 # Whom: Hye-Shik Chang # # $FreeBSD$ # PORTNAME= xmms -PORTVERSION= 1.02 +PORTVERSION= 1.03 CATEGORIES= audio python MASTER_SITES= http://www.via.ecp.fr/~flo/2002/PyXMMS/dist/ \ http://www3.kr.freebsd.org/~perky/distfiles/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= PyXMMS-${PORTVERSION} +DISTNAME= pyxmms-${PORTVERSION} MAINTAINER= perky@fallin.lv BUILD_DEPENDS= ${XMMS_CONFIG}:${PORTSDIR}/audio/xmms LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms USE_PYTHON= yes USE_PYDISTUTILS= yes USE_GLIB= yes PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g} XMMS_CONFIG?= ${X11BASE}/bin/xmms-config MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" XMMS_CONFIG="${XMMS_CONFIG}" .include Property changes on: head/audio/py-xmms/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/audio/py-xmms/distinfo =================================================================== --- head/audio/py-xmms/distinfo (revision 58530) +++ head/audio/py-xmms/distinfo (revision 58531) @@ -1 +1 @@ -MD5 (PyXMMS-1.02.tar.gz) = 9f9ed8afc0583446c8b3440457fabbb3 +MD5 (pyxmms-1.03.tar.gz) = 143fc68c84e505d2d3997e25b730bafa Property changes on: head/audio/py-xmms/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/audio/py-xmms/files/patch-setup.py =================================================================== --- head/audio/py-xmms/files/patch-setup.py (revision 58530) +++ head/audio/py-xmms/files/patch-setup.py (revision 58531) @@ -1,37 +1,42 @@ ---- setup.py.orig Mon Mar 18 01:08:13 2002 -+++ setup.py Tue Mar 19 09:42:54 2002 -@@ -34,9 +34,12 @@ - # end of the gcc command, which is useless in this case. So, I use - # "include_dirs" instead. +--- setup.py.orig Sun Apr 7 22:52:01 2002 ++++ setup.py Sun May 5 00:02:33 2002 +@@ -20,7 +20,7 @@ + # Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + # MA 02111-1307, USA. -+import os, re -+ - PACKAGE = "PyXMMS" - VERSION = "1.02" +-import os, string, sys ++import os, string, sys, re + from distutils.core import setup, Extension + + # Notes: +@@ -36,7 +36,8 @@ + + PACKAGE = "pyxmms" + VERSION = "1.03" -GLIB_CONFIG = "glib-config" +GLIB_CONFIG = os.environ['GLIB_CONFIG'] +XMMS_CONFIG = os.environ['XMMS_CONFIG'] def main(): glib_opts = {} -@@ -51,6 +54,9 @@ - # Suppress the -I in each -Idir output by glib-config --cflags (ugly) +@@ -52,6 +53,9 @@ glib_include_dirs = map(lambda s: s[2:], string.split(glib_opts["cflags"], ' ')) -+ + + XMMSINCDIR = re.findall('-I([^ ]+)', os.popen(XMMS_CONFIG+" --cflags").read()) + XMMSLIBDIR = re.findall('-L([^ ]+)', os.popen(XMMS_CONFIG+" --libs").read()) - ++ setup(name=PACKAGE, version=VERSION, -@@ -69,8 +75,9 @@ + description="A Python interface to XMMS", +@@ -69,8 +73,8 @@ keywords=["xmms"], py_modules=["xmms"], ext_modules=[Extension("_xmms", ["_xmmsmodule.c"], - include_dirs=glib_include_dirs, +- libraries=["xmms"], + include_dirs=glib_include_dirs+XMMSINCDIR, - libraries=["xmms"], -+ library_dirs=XMMSLIBDIR, ++ libraries=["xmms"], library_dirs=XMMSLIBDIR, extra_link_args=[glib_opts["libs"]])]) if __name__ == "__main__": main() Property changes on: head/audio/py-xmms/files/patch-setup.py ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property