Subject: Re: pkg/7959: postgresql-patching fails
To: None <netbsd-bugs@netbsd.org, gnats-bugs@gnats.netbsd.org>
From: Bjoern Labitzke <hermit@labitzke.isdn.cs.tu-berlin.de>
List: netbsd-bugs
Date: 07/11/1999 17:43:31
Sorry, after creating the diff I found I left out a line. I just added it
to the diff and missed, that the new line is ignored as long as the header
of the diff doesn't change. I guess I learned not to edit diffs by hand if
possible. Here is the correct version. In addition to that postgresql
didn't find tcl.h anymore. I changed the Makefile to include the correct
directories (I hope :-) ).

patch-ag:
--- include/port/bsd.h.orig     Sun Jul 19 03:19:53 1998
+++ include/port/bsd.h  Sun Jul 11 14:39:21 1999
@@ -28,3 +28,12 @@
 /* #   undef HAS_TEST_AND_SET */
 #endif
 typedef unsigned char slock_t;
+
+#if defined(__arm32__)
+#define HAS_TEST_AND_SET
+#endif
+
+#if defined(__powerpc__)
+#define HAS_TEST_AND_SET
+typedef unsigned int slock_t;
+#endif


================================================
--- Makefile.orig       Sun Jul 11 16:54:24 1999
+++ Makefile    Sun Jul 11 17:39:20 1999
@@ -32,11 +32,10 @@
 CONFIGURE_ARGS=        --prefix=${PREFIX}/${PGUSER} \
                        --enable-locale \
                        --with-tcl \
-                       --with-tclconfig="${PREFIX}/lib/tcl8.0 ${PREFIX}/lib/tk8.0" \
-                       --with-includes=${PREFIX}/include \
-                       --with-libs=${PREFIX}/lib \
+                       --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0" \
+                       --with-includes="${PREFIX}/include ${LOCALBASE}/include/tcl8.0 ${LOCALBASE}/include/tk8.0" \
+                       --with-libs=${LOCALBASE}/lib \
                        --with-template=`${ECHO} ${OPSYS} | ${TR} '[A-Z]' '[a-z]'`
-CPPFLAGS+=             -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0

 INSTALL_TARGET=        install install-man


-- 
Bjoern Labitzke  <hermit@cs.tu-berlin.de>
   Use PGP! (Don't you use envelopes for your letters?)