Even though this package is supposed to be deprecated there are still people

using it and if it is going to be in the tree it should at least compile
and run with current versions of Python.

3 files changed, 28 insertions, 26 deletions

diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index c082f191d7f..77c327661ce 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2004/07/22 09:16:02 recht Exp $
+# $NetBSD: Makefile,v 1.20 2004/09/01 19:17:05 darcy Exp $
 
 DISTNAME=	gdmodule.c
 PKGNAME=	${PYPKGPREFIX}-gd-1.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics python
 MASTER_SITES=	http://starship.python.net/~richard/gdmodule/
-DISTFILES=	gdmodule.c
+EXTRACT_SUFX=
 
 MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://starship.python.net/~richard/gdmodule/
@@ -17,21 +17,11 @@ WRKSRC=		${WRKDIR}
 ALL_TARGET=	default
 USE_BUILDLINK3=	yes
 
-# this pkg uses Makefile.pre.in
-PYTHON_VERSIONS_ACCEPTED=	20 21
-BUILDLINK_DEPENDS.python20=	python20>=2.0.1nb1
-BUILDLINK_DEPENDS.python21=	python21>=2.1.1nb1
+PYDISTUTILSPKG= yes
+PYBINMODULE=    yes
 
-PY_PATCHPLIST=	yes
-
-post-extract:
-	${SED}	-e 's,@LOCALBASE@,${LOCALBASE},g' \
-		-e 's,@X11BASE@,${X11BASE},g' \
-		${FILESDIR}/Setup.in > ${WRKSRC}/Setup.in
-
-do-configure:
-	${CP} ${PREFIX}/${PYLIB}/config/Makefile.pre.in ${WRKSRC}
-	cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in boot
+post-patch:
+	${SED} 's+@LOCALBASE@+${LOCALBASE}+g' ${FILESDIR}/Setup.in > ${WRKSRC}/setup.py
 
 .include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
diff --git a/graphics/py-gd/PLIST b/graphics/py-gd/PLIST
index 276eed6a100..b3d51aa2057 100644
--- a/graphics/py-gd/PLIST
+++ b/graphics/py-gd/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/19 17:49:14 drochner Exp $
-${PYSITELIB}/gdmodule.so
+@comment $NetBSD: PLIST,v 1.3 2004/09/01 19:17:05 darcy Exp $
+${PYSITELIB}/gd.so
diff --git a/graphics/py-gd/files/Setup.in b/graphics/py-gd/files/Setup.in
index 316460bd55c..a0abfb29bbe 100644
--- a/graphics/py-gd/files/Setup.in
+++ b/graphics/py-gd/files/Setup.in
@@ -1,8 +1,20 @@
-# $NetBSD: Setup.in,v 1.4 1999/11/02 19:48:57 jlam Exp $
+#!/usr/bin/env python
+# $NetBSD: Setup.in,v 1.5 2004/09/01 19:17:05 darcy Exp $
 
-*shared*
-gd gdmodule.c \
-	-I@LOCALBASE@/include -I@X11BASE@/include -I@X11BASE@/include/X11 \
-	-L@LOCALBASE@/lib -R@LOCALBASE@/lib \
-	-L@X11BASE@/lib -R@X11BASE@/lib \
-	-lgd -lpng -lz -lttf -lintl -lXpm -lX11
+from distutils.core import setup, Extension
+
+setup(name = "gdmodule",
+	version = "1.3",
+	description = "Interface to gd graphics library",
+	author = "Richard Jones",
+	author_email = "richard@bofh.asn.au",
+	url = "http://starship.python.net/~richard/gdmodule/",
+	ext_modules = [Extension(
+		name = 'gd',
+		sources = ['gdmodule.c'],
+		include_dirs = ['@LOCALBASE@/include/'],
+		library_dirs = ['@LOCALBASE@/lib'],
+		libraries = ['gd'],
+	)],
+
+)