From ef750e6b09bce7adb1191f04eab14fb15954e0c0 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@FreeBSD.org>
Date: Fri, 22 Aug 2003 20:06:42 +0000
Subject: Update py-vorbis to 1.3

---
 audio/py-vorbis/Makefile                   |  6 +++---
 audio/py-vorbis/distinfo                   |  2 +-
 audio/py-vorbis/files/patch-pyvorbisfile.c | 20 --------------------
 audio/py-vorbis/files/patch-setup.py       | 11 -----------
 audio/py-vorbis/pkg-plist                  |  2 +-
 5 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 audio/py-vorbis/files/patch-pyvorbisfile.c
 delete mode 100644 audio/py-vorbis/files/patch-setup.py

(limited to 'audio/py-vorbis')

diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 7ebc1fe0c417..3bcbca635499 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vorbis
-PORTVERSION=	1.0
+PORTVERSION=	1.3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.andrewchatham.com/pyogg/download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,8 +15,8 @@ DISTNAME=	pyvorbis-${PORTVERSION}
 MAINTAINER=	nbm@FreeBSD.org
 COMMENT=	Object-oriented Python bindings for the vorbis library
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_oggmodule.so:${PORTSDIR}/audio/py-ogg
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_oggmodule.so:${PORTSDIR}/audio/py-ogg
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
 LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis
 
 USE_PYTHON=		yes
diff --git a/audio/py-vorbis/distinfo b/audio/py-vorbis/distinfo
index c1dd8136d074..371044184000 100644
--- a/audio/py-vorbis/distinfo
+++ b/audio/py-vorbis/distinfo
@@ -1 +1 @@
-MD5 (pyvorbis-1.0.tar.gz) = 158e38785543f2d945e20f67f77299b9
+MD5 (pyvorbis-1.3.tar.gz) = 3ddd0dc996b57827c324910cc899d40b
diff --git a/audio/py-vorbis/files/patch-pyvorbisfile.c b/audio/py-vorbis/files/patch-pyvorbisfile.c
deleted file mode 100644
index 7a33f3d00568..000000000000
--- a/audio/py-vorbis/files/patch-pyvorbisfile.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/pyvorbisfile.c.orig	Mon Sep 23 16:35:18 2002
-+++ src/pyvorbisfile.c	Mon Sep 23 16:37:20 2002
-@@ -1,5 +1,17 @@
- #include <stdio.h>
-+
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
-+#if (defined(BSD))
-+#include <machine/endian.h>
-+#define __BYTE_ORDER BYTE_ORDER
-+#define __BIG_ENDIAN BIG_ENDIAN
-+#else
- #include <endian.h>
-+#endif
-+
- #include <assert.h>
- 
- #include "general.h"
diff --git a/audio/py-vorbis/files/patch-setup.py b/audio/py-vorbis/files/patch-setup.py
deleted file mode 100644
index 0a9871e385b6..000000000000
--- a/audio/py-vorbis/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	Mon Sep 23 16:29:24 2002
-+++ setup.py	Mon Sep 23 16:29:34 2002
-@@ -20,7 +20,7 @@
- 
- def get_setup():
-     data = {}
--    r = re.compile(r'(\S+)\s*?=\s*?(.+)')
-+    r = re.compile(r'(\S+)\s*?=\s*(.+)')
-     
-     if not os.path.isfile('Setup'):
-         print "No 'Setup' file. Perhaps you need to run the configure script."
diff --git a/audio/py-vorbis/pkg-plist b/audio/py-vorbis/pkg-plist
index 1f1fc72287fb..1f4f0ab2d033 100644
--- a/audio/py-vorbis/pkg-plist
+++ b/audio/py-vorbis/pkg-plist
@@ -1 +1 @@
-lib/%%PYTHON_VERSION%%/site-packages/ogg/vorbismodule.so
+lib/%%PYTHON_VERSION%%/site-packages/ogg/vorbis.so
-- 
cgit v1.2.3