Subject: pkg/29883: pkgsrc print/pdflib on darwin header file fixes
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Darrin B.Jewell <dbj@netbsd.org>
List: pkgsrc-bugs
Date: 04/04/2005 21:15:01
>Number: 29883
>Category: pkg
>Synopsis: pkgsrc print/pdflib on darwin header file fixes
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Mon Apr 04 21:15:00 +0000 2005
>Originator: Darrin B. Jewell
>Release: pkgsrc-2005Q1
>Organization:
>Environment:
Darwin Quiteria 7.8.0 Darwin Kernel Version 7.8.0: Wed Dec 22 14:26:17 PST 2004; root:xnu/xnu-517.11.1.obj~1/RELEASE_PPC Power Macintosh powerpc
>Description:
Installing print/pdflib fails on darwin with two minor problems.
1. It incorrectly enables a section of os9 code in a config header
2. It attempts to include a Carbon header directly that it can't find.
>How-To-Repeat:
Attempt to install print/pdflib
>Fix:
The following patch allows this package to build on my system:
Index: distinfo
===================================================================
RCS file: /u3/n/rsync/cvsroot/pkgsrc/print/pdflib/distinfo,v
retrieving revision 1.8
diff -u -u -r1.8 distinfo
--- distinfo 24 Feb 2005 12:51:44 -0000 1.8
+++ distinfo 4 Apr 2005 20:47:27 -0000
@@ -4,3 +4,5 @@
RMD160 (pdflib-4.0.3.tar.gz) = 5e21c05a9e2c49d90ccffea5a2ba085776b457c7
Size (pdflib-4.0.3.tar.gz) = 2373817 bytes
SHA1 (patch-aa) = af526a893447186da5a09145bfd30994855e8e8d
+SHA1 (patch-ab) = b10a588d1513c53a9b2bd07c984a8d037d60c43c
+SHA1 (patch-ac) = 39f16a26dca833150c3cf60fe1ad8d59f7fed12c
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ab 4 Apr 2005 20:10:26 -0000
@@ -0,0 +1,13 @@
+$NetBSD: $
+
+--- pdflib/p_config.h.orig Wed Jun 19 12:01:15 2002
++++ pdflib/p_config.h Mon Apr 4 16:07:59 2005
+@@ -127,7 +127,7 @@
+ /* try to identify Mac OS 9 compilers */
+
+ #if (defined macintosh || defined __POWERPC__ || defined __CFM68K__ || \
+- defined __MC68K__) && !defined MAC
++ defined __MC68K__) && !defined MAC && !defined MACOSX
+ #define MAC
+ #endif
+
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ac 4 Apr 2005 20:47:16 -0000
@@ -0,0 +1,18 @@
+$NetBSD: $
+
+--- pdflib/p_basic.c.orig Wed Jun 19 12:01:15 2002
++++ pdflib/p_basic.c Mon Apr 4 16:45:29 2005
+@@ -57,8 +57,12 @@
+ #include <io.h>
+ #endif
+
+-#if defined(MAC) || defined(MACOSX)
++#if defined(MAC)
+ #include <Files.h>
++#endif
++
++#if defined(MACOSX)
++#include <CoreServices/CoreServices.h>
+ #endif
+
+ #ifdef WIN32