update to py-gd 0.58

graphics/py-gd/Makefile

@@ -1,12 +1,13 @@
-# $OpenBSD: Makefile,v 1.19 2013/06/04 18:41:50 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2014/03/17 10:19:30 sthen Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	Python wrapper for the GD library
 
-DISTNAME=	gdmodule-0.56
+MODPY_EGG_VERSION= 0.58
+DISTNAME=	gdmodule-${MODPY_EGG_VERSION}
+DISTFILES=	${DISTNAME}{v${MODPY_EGG_VERSION}}${EXTRACT_SUFX}
 PKGNAME=	py-${DISTNAME:L:S/module//}
-REVISION=	7
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://newcenturycomputers.net/projects/gdmodule.html
@@ -14,9 +15,9 @@ HOMEPAGE=	http://newcenturycomputers.net/projects/gdmodule.html
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=	jpeg png z gd>=20 ${MODPY_WANTLIB}
+WANTLIB += freetype gd>=20 jpeg png pthread z ${MODPY_WANTLIB}
 
-MASTER_SITES=	http://newcenturycomputers.net/projects/download.cgi/
+MASTER_SITES=	https://github.com/Solomoriah/gdmodule/archive/
 
 MODULES=	lang/python
 
@@ -29,15 +30,12 @@ NO_TEST=	Yes
 EXAMPLESDIR=	${PREFIX}/share/examples/py-gd
 DOCSDIR=	${PREFIX}/share/doc/py-gd
 
-do-configure:
-	@perl -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g;" \
-		-e "s,%%LIBPNG%%,${LOCALBASE}/include,g" \
-			${WRKSRC}/${MODPY_SETUP}
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/Setup.py
 
 post-install:
 	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/gddemo.py ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/adventure.ttf ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/demo/* ${EXAMPLESDIR}
 	${INSTALL_DATA_DIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/gd-ref.html ${DOCSDIR}
 

graphics/py-gd/distinfo

@@ -1,5 +1,2 @@
-MD5 (gdmodule-0.56.tar.gz) = am2yigidTK9akhzSZqYrPQ==
-RMD160 (gdmodule-0.56.tar.gz) = +zwud6WYQCctEseG0YewluHuxT0=
-SHA1 (gdmodule-0.56.tar.gz) = UZpk4UiXWZ2Hm4Kl9bDzCKFIJuM=
-SHA256 (gdmodule-0.56.tar.gz) = o6L9Y3jjLxCjSMTbQoqR4sGtwo3m7DXAYZpS43n07ew=
-SIZE (gdmodule-0.56.tar.gz) = 48748
+SHA256 (gdmodule-0.58.tar.gz) = aaM5t0szuxWAYCQ2EJH6/+zXR0EBl4Ab9fHJLyEmFSY=
+SIZE (gdmodule-0.58.tar.gz) = 76670

graphics/py-gd/patches/patch-Setup_py

@@ -1,34 +1,37 @@
-$OpenBSD: patch-Setup_py,v 1.2 2005/10/24 05:05:45 fgsch Exp $
---- Setup.py.orig	Fri Mar 11 01:29:59 2005
-+++ Setup.py	Thu Oct 20 00:21:04 2005
-@@ -40,26 +40,21 @@ def remove(itm, lst):
+$OpenBSD: patch-Setup_py,v 1.3 2014/03/17 10:19:30 sthen Exp $
+--- Setup.py.orig	Fri Jun 21 14:10:13 2013
++++ Setup.py	Mon Mar 17 10:11:13 2014
+@@ -40,10 +40,7 @@ def remove(itm, lst):
  # Unixoid OS's I will just look for the usual suspects.
  
  libdirs = dirtest([
 -    "/usr/local/lib", "/sw/lib", "/usr/lib",
+-    "/usr/lib/i386-linux-gnu", "/usr/lib/x86_64-linux-gnu",
 -    "/usr/lib/X11", "/usr/X11R6/lib",
 -    "/opt/gnome/lib",
-+    "/usr/lib", "%%LOCALBASE%%/lib",
++    "${LOCALBASE}/lib", "/usr/lib", "${X11BASE}/lib",
  ])
  
+ try:
+@@ -55,9 +52,7 @@ except:
  # include_dirs are also non-portable; same trick here.
  
  incdirs = dirtest([
 -    "/usr/local/include", "/sw/include", "/usr/include",
 -    "/usr/include/X11", "/usr/X11R6/include",
 -    "/opt/gnome/include",
-+    "/usr/include", "%%LOCALBASE%%/include",
-+    "%%LIBPNG%%",
++    "${LOCALBASE}/include", "/usr/include", "${X11BASE}/include",
  ])
  
- # Try to identify our libraries
+ try:
+@@ -70,9 +65,7 @@ except:
  
  want_libs = [
      "gd",
--    "jpeg", "png", "gif", "z",
+-    "jpeg", "png", "gif",
 -    "X11", "Xpm",
--    "ttf", "freetype",
-+    "jpeg", "png", "z",
+-    "z", "ttf", "freetype",
++    "jpeg", "png", "z", "freetype",
  ]
  
  libs = filetest(libdirs, want_libs)

graphics/py-gd/patches/patch-gddemo_py

@@ -1,12 +0,0 @@
-$OpenBSD: patch-gddemo_py,v 1.2 2005/10/24 05:05:45 fgsch Exp $
---- gddemo.py.orig	Fri Mar 11 00:45:38 2005
-+++ gddemo.py	Wed Oct 12 11:12:04 2005
-@@ -4,7 +4,7 @@ import gd, os, cStringIO, urllib2
- 
- os.environ["GDFONTPATH"] = "."
- 
--FONT = "adventure"
-+FONT = "adventure.ttf"
- 
- def simple():
-     im = gd.image((200, 200))

graphics/py-gd/pkg/PLIST

@@ -1,9 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2004/10/27 09:21:46 xsa Exp $
+@comment $OpenBSD: PLIST,v 1.2 2014/03/17 10:19:30 sthen Exp $
 lib/python${MODPY_VERSION}/site-packages/_gd.so
 lib/python${MODPY_VERSION}/site-packages/gd.py
 lib/python${MODPY_VERSION}/site-packages/gd.pyc
-share/doc/py-gd/
-share/doc/py-gd/gd-ref.html
-share/examples/py-gd/
-share/examples/py-gd/adventure.ttf
-share/examples/py-gd/gddemo.py
+lib/python${MODPY_VERSION}/site-packages/gdmodule-0.58-py${MODPY_VERSION}.egg-info
+share/doc/${MODPY_PY_PREFIX}gd/
+share/doc/${MODPY_PY_PREFIX}gd/gd-ref.html
+share/examples/${MODPY_PY_PREFIX}gd/
+share/examples/${MODPY_PY_PREFIX}gd/Pacifico SIL OFL Font License 1.1.txt
+share/examples/${MODPY_PY_PREFIX}gd/Pacifico.ttf
+share/examples/${MODPY_PY_PREFIX}gd/gddemo.py