Attachment 21943 Details for Bug 38258 – file.diff

[patch] file.diff

file.diff (text/plain), 2.61 KB, created by Hye-Shik Chang on 2002-05-18 23:30:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hye-Shik Chang

Created: 2002-05-18 23:30:05 UTC

Size: 2.61 KB

patch

obsolete

>diff -ruN py-xmms.orig/Makefile py-xmms/Makefile
>--- py-xmms.orig/Makefile	Sun May  5 02:24:27 2002
>+++ py-xmms/Makefile	Sat May 18 22:40:53 2002
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	xmms
>-PORTVERSION=	1.03
>+PORTVERSION=	1.04
> CATEGORIES=	audio python
> MASTER_SITES=	http://www.via.ecp.fr/~flo/2002/PyXMMS/dist/ \
> 		http://www3.kr.freebsd.org/~perky/distfiles/
>@@ -24,5 +24,8 @@
> 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}"
>+
>+post-patch:
>+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} patch
> 
> .include <bsd.port.mk>
>diff -ruN py-xmms.orig/distinfo py-xmms/distinfo
>--- py-xmms.orig/distinfo	Sat May  4 23:59:36 2002
>+++ py-xmms/distinfo	Sat May 18 20:26:33 2002
>@@ -1 +1 @@
>-MD5 (pyxmms-1.03.tar.gz) = 143fc68c84e505d2d3997e25b730bafa
>+MD5 (pyxmms-1.04.tar.gz) = a0947b1f2e4e446842d9414866c8ad6a
>diff -ruN py-xmms.orig/files/patch-setup.py py-xmms/files/patch-setup.py
>--- py-xmms.orig/files/patch-setup.py	Sun May  5 00:02:49 2002
>+++ py-xmms/files/patch-setup.py	Sat May 18 23:04:14 2002
>@@ -1,5 +1,5 @@
>---- setup.py.orig	Sun Apr  7 22:52:01 2002
>-+++ setup.py	Sun May  5 00:02:33 2002
>+--- setup.py.orig	Sun May 12 22:37:06 2002
>++++ setup.py	Sat May 18 23:03:58 2002
> @@ -20,7 +20,7 @@
>  # Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
>  # MA 02111-1307, USA.
>@@ -9,17 +9,30 @@
>  from distutils.core import setup, Extension
>  
>  # Notes:
>-@@ -36,7 +36,8 @@
>+@@ -34,9 +34,21 @@
>+ #     end of the gcc command, which is useless in this case. So, I use
>+ #     "include_dirs" instead.
>  
>++def patch4gcc3(fname):
>++    instr = 0
>++    cont = open(fname).readlines()
>++    of = open(fname, 'w')
>++    for l in cont:
>++        instr = (instr+len(re.findall(r'(^")|([^\\]")', l))) % 2
>++        print >>of, l[:-1] + ((not l.startswith('/*') and instr) and "\\n\\" or "")
>++if 'patch' in sys.argv:
>++    patch4gcc3('_xmmsmodule.c')
>++    raise SystemExit
>++
>  PACKAGE = "pyxmms"
>- VERSION = "1.03"
>+ VERSION = "1.04"
> -GLIB_CONFIG = "glib-config"
> +GLIB_CONFIG = os.environ['GLIB_CONFIG']
> +XMMS_CONFIG = os.environ['XMMS_CONFIG']
>  
>  def main():
>      glib_opts = {}
>-@@ -52,6 +53,9 @@
>+@@ -52,6 +64,9 @@
>      glib_include_dirs = map(lambda s: s[2:],
>                              string.split(glib_opts["cflags"], ' '))
>  
>@@ -29,7 +42,7 @@
>      setup(name=PACKAGE,
>            version=VERSION,
>            description="A Python interface to XMMS",
>-@@ -69,8 +73,8 @@
>+@@ -69,8 +84,8 @@
>            keywords=["xmms"],
>            py_modules=["xmms"],
>            ext_modules=[Extension("_xmms", ["_xmmsmodule.c"],

Actions: View | Diff

Attachments on bug 38258: 21943