- update to py-cups-1.9.40

- use SUBST_CMD in the process

looks fine to jasper@
This commit is contained in:
ajacoutot 2008-07-08 09:32:49 +00:00
parent 2ea81b17d2
commit 0e9c5c133e
4 changed files with 24 additions and 24 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.2 2008/04/20 09:49:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2008/07/08 09:32:49 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= CUPS bindings for Python
VERSION= 1.9.38
VERSION= 1.9.40
DISTNAME= pycups-${VERSION}
PKGNAME= py-cups-${VERSION}p0
PKGNAME= py-cups-${VERSION}
CATEGORIES= print
HOMEPAGE= http://cyberelk.net/tim/software/pycups/
@ -35,7 +35,6 @@ MAKE_ENV= PYTON="${MODPY_BIN}" \
NO_REGRESS= Yes
pre-configure:
@perl -pi -e 's,!!PREFIX!!,${PREFIX},' ${WRKSRC}/setup.py
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},' ${WRKSRC}/cupsconnection.c
${SUBST_CMD} ${WRKSRC}/cupsconnection.c ${WRKSRC}/setup.py
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (pycups-1.9.38.tar.bz2) = zzo9s/H/CL3yySVAhujscA==
RMD160 (pycups-1.9.38.tar.bz2) = iEYd025kMJ6bwU3yT21pIOXa93Q=
SHA1 (pycups-1.9.38.tar.bz2) = bvFR8J7wwOk1Na5dKN2dNUFdoF4=
SHA256 (pycups-1.9.38.tar.bz2) = nG/sDu0ia1uT2w8NmyKa/0pXHfxFQsuFGI5vTxPC78M=
SIZE (pycups-1.9.38.tar.bz2) = 37041
MD5 (pycups-1.9.40.tar.bz2) = 6go15XjA9Kz/deMOy+cEyw==
RMD160 (pycups-1.9.40.tar.bz2) = QYOez+qhiQem9SaWJOiKoTJb3Wk=
SHA1 (pycups-1.9.40.tar.bz2) = eU4yq2e1noICFrAh9O+wLlRhXyI=
SHA256 (pycups-1.9.40.tar.bz2) = b4surd+IiaDAcqQQIDX/9Wm9aGbrsYYQQ+IKlzv+il0=
SIZE (pycups-1.9.40.tar.bz2) = 38717

View File

@ -1,12 +1,13 @@
$OpenBSD: patch-cupsconnection_c,v 1.1.1.1 2008/04/10 10:21:42 jasper Exp $
--- cupsconnection.c.orig Wed Apr 9 23:35:15 2008
+++ cupsconnection.c Wed Apr 9 23:35:35 2008
@@ -2722,7 +2722,7 @@ Connection_printTestPage (Connection *self, PyObject *
if (!fileobj) {
if ((datadir = getenv ("CUPS_DATADIR")) == NULL)
- datadir = "/usr/share/cups";
+ datadir = "!!LOCALBASE!!/share/cups";
snprintf (filename, sizeof (filename), "%s/data/testprint.ps", datadir);
file = filename;
$OpenBSD: patch-cupsconnection_c,v 1.2 2008/07/08 09:32:49 ajacoutot Exp $
--- cupsconnection.c.orig Wed Jul 2 16:12:01 2008
+++ cupsconnection.c Wed Jul 2 16:12:59 2008
@@ -2804,8 +2804,7 @@ Connection_printTestPage (Connection *self, PyObject *
if ((datadir = getenv ("CUPS_DATADIR")) != NULL)
snprintf (filename, sizeof (filename), testprint, datadir);
else {
- const char *const dirs[] = { "/usr/share/cups",
- "/usr/local/share/cups",
+ const char *const dirs[] = { "${LOCALBASE}/share/cups",
NULL };
int i;
for (i = 0; (datadir = dirs[i]) != NULL; i++) {

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-setup_py,v 1.1.1.1 2008/04/10 10:21:42 jasper Exp $
$OpenBSD: patch-setup_py,v 1.2 2008/07/08 09:32:49 ajacoutot Exp $
--- setup.py.orig Thu Jul 5 18:43:55 2007
+++ setup.py Thu Mar 27 15:25:11 2008
@@ -3,4 +3,5 @@ setup (name="cups", version="1.0",
@ -7,4 +7,4 @@ $OpenBSD: patch-setup_py,v 1.1.1.1 2008/04/10 10:21:42 jasper Exp $
"cupsppd.c"],
- libraries=["cups"])])
+ libraries=["cups", "iconv"],
+ include_dirs=['/usr/local/include'])])
+ include_dirs=['${LOCALBASE}/include'])])