diff options
| author | spz <spz@pkgsrc.org> | 2010-10-29 21:00:17 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2010-10-29 21:00:17 +0000 |
| commit | 23554ac3aa0b664ad705f759944879a5daee7b72 (patch) | |
| tree | f17a53a69dceb0507c5d1b88df5eceb77afa3d76 /print | |
| parent | 60e2d71e0fc1de67d3ca3d97b2ebd44375e165e1 (diff) | |
| download | pkgsrc-23554ac3aa0b664ad705f759944879a5daee7b72.tar.gz | |
Pullup ticket 3263 - requested by tron
build and portability fix
Revisions pulled up:
- pkgsrc/print/a2ps/Makefile 1.70
- pkgsrc/print/a2ps/distinfo 1.12
Files added:
pkgsrc/print/a2ps/patches/patch-ac
-------------------------------------------------------------------------
Module Name: pkgsrc
Committed By: tron
Date: Thu Oct 28 23:21:53 UTC 2010
Modified Files:
pkgsrc/print/a2ps: Makefile distinfo
Added Files:
pkgsrc/print/a2ps/patches: patch-ac
Log Message:
Fix two problem under Mac OS X:
1.) stpcpy() is a macro under at least Mac OS 10.6. Avoid build failures
by not defining a dodgy prototype for it.
2.) Don't strip installed binaries to allow the dynamic linker to find
symbols required by the shared library but defined by the application.
This fixes PR pkg/41827 by Christopher M. Fuhrman.
Bump package revision as the package built fine under Mac OS 10.5 before
but didn't work.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/print/a2ps/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/a2ps/distinfo
cvs rdiff -u -r0 -r1.7 pkgsrc/print/a2ps/patches/patch-ac
Diffstat (limited to 'print')
| -rw-r--r-- | print/a2ps/Makefile | 9 | ||||
| -rw-r--r-- | print/a2ps/distinfo | 3 | ||||
| -rw-r--r-- | print/a2ps/patches/patch-ac | 16 |
3 files changed, 26 insertions, 2 deletions
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile index 9955c307a17..75d649168b7 100644 --- a/print/a2ps/Makefile +++ b/print/a2ps/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.69 2008/11/11 13:48:58 wiz Exp $ +# $NetBSD: Makefile,v 1.69.16.1 2010/10/29 21:00:17 spz Exp $ DISTNAME= a2ps-4.14 +PKGREVISION= 1 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GNU:=a2ps/} \ ftp://ftp.enst.fr/pub/unix/a2ps/ @@ -16,7 +17,13 @@ PKG_DESTDIR_SUPPORT= user-destdir STRIP= # empty USE_LIBTOOL= yes + +.include "../../mk/bsd.prefs.mk" + CFLAGS.Darwin+= -flat_namespace +.if ${OPSYS} == "Darwin" +_STRIPFLAG_INSTALL= # none +.endif USE_TOOLS+= file:run gmake lex mktemp:run perl:run CONFIGURE_ENV+= file_prog=${FILE_CMD:Q} diff --git a/print/a2ps/distinfo b/print/a2ps/distinfo index cc284e164bf..d7c6ada101f 100644 --- a/print/a2ps/distinfo +++ b/print/a2ps/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.11 2008/11/10 18:00:34 wiz Exp $ +$NetBSD: distinfo,v 1.11.16.1 2010/10/29 21:00:17 spz Exp $ SHA1 (a2ps-4.14.tar.gz) = 365abbbe4b7128bf70dad16d06e23c5701874852 RMD160 (a2ps-4.14.tar.gz) = a5105d6256a809483e099519325979aaaff7219e Size (a2ps-4.14.tar.gz) = 2552507 bytes SHA1 (patch-aa) = 6317b6abca697388538fc705037da55379a4e1e1 SHA1 (patch-ab) = 7b1f1e3ed2af47e7d9864ec2dbcd7d105f93632a +SHA1 (patch-ac) = 8e09c4c3b320b58bf12c4266d4d22977b5f9b826 diff --git a/print/a2ps/patches/patch-ac b/print/a2ps/patches/patch-ac new file mode 100644 index 00000000000..0028315ad36 --- /dev/null +++ b/print/a2ps/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.7.2.2 2010/10/29 21:00:17 spz Exp $ + +Fix build problem under Mac OS X where stpcpy() is a macro. + +--- lib/xstrrpl.c.orig 2007-12-29 01:37:54.000000000 +0000 ++++ lib/xstrrpl.c 2010-10-28 23:29:51.000000000 +0100 +@@ -22,7 +22,9 @@ + #include <assert.h> + #include "xstrrpl.h" + ++#ifndef stpcpy + extern char * stpcpy(); ++#endif + + /* Perform subsitutions in string. Result is malloc'd + E.g., result = xstrrrpl ("1234", subst) gives result = "112333" |