Attachment 12577 Details for Bug 24231 – file.diff

[patch] file.diff

file.diff (text/plain), 3.67 KB, created by ak03 on 2001-01-10 19:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ak03

Created: 2001-01-10 19:20:01 UTC

Size: 3.67 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/lang/python/Makefile,v
>retrieving revision 1.74
>diff -u -r1.74 Makefile
>--- Makefile	2000/12/07 12:06:30	1.74
>+++ Makefile	2001/01/10 18:37:29
>@@ -61,6 +61,17 @@
> .endif
> 
> #
>+# The expat module
>+#
>+.if !defined(WITHOUT_EXPAT)
>+SETUP_LOCAL+=	Setup.expat
>+PLIST_EXPAT=	${PKGDIR}/pkg-plist.expat
>+LIB_DEPENDS+=	expat.2:${PORTSDIR}/textproc/expat2
>+CFLAGS+=	-I${LOCALBASE}/include
>+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
>+.endif
>+
>+#
> # Install the Tools by default. It contains scripts ranging from an IDE
> # to a web tree checker, to a collection of simple scripts that are useful
> # while extending or managing Python.
>@@ -116,7 +127,7 @@
> 		${PREFIX}/lib/${PYTHON_VERSION}/${platform}/
> .endfor
> .endfor
>-	@sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_DEMO} ${PKGDIR}/pkg-plist
>+	@sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_DEMO} ${PLIST_EXPAT} ${PKGDIR}/pkg-plist
> 
> post-install:
> 	strip ${PREFIX}/bin/python
>Index: pkg-plist.expat
>===================================================================
>RCS file: pkg-plist.expat
>diff -N pkg-plist.expat
>--- /dev/null	Wed Jan 10 13:43:03 2001
>+++ pkg-plist.expat	Wed Jan 10 13:08:29 2001
>@@ -0,0 +1 @@
>+lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so
>Index: files/Setup.expat
>===================================================================
>RCS file: Setup.expat
>diff -N Setup.expat
>--- /dev/null	Wed Jan 10 13:43:03 2001
>+++ Setup.expat	Wed Jan 10 13:15:29 2001
>@@ -0,0 +1,23 @@
>+*shared*
>+
>+# Interface to the Expat XML parser
>+#
>+# Expat is written by James Clark and must be downloaded separately
>+# (see below).  The pyexpat module was written by Paul Prescod after a
>+# prototype by Jack Jansen.
>+#
>+# The Expat dist includes Windows .lib and .dll files.  Home page is at
>+# http://www.jclark.com/xml/expat.html, the current production release is
>+# always ftp://ftp.jclark.com/pub/xml/expat.zip.
>+#
>+# EXPAT_DIR, below, should point to the expat/ directory created by
>+# unpacking the Expat source distribution.
>+#
>+# Note: the expat build process doesn't yet build a libexpat.a; you can
>+# do this manually while we try convince the author to add it.  To do so,
>+# cd to EXPAT_DIR, run "make" if you have not done so, then run:
>+#
>+#    ar cr libexpat.a xmltok/*.o xmlparse/*.o
>+#
>+pyexpat pyexpat.c -lexpat
>+
>Index: files/patch-config.h.in
>===================================================================
>RCS file: patch-config.h.in
>diff -N patch-config.h.in
>--- /dev/null	Wed Jan 10 13:43:03 2001
>+++ patch-config.h.in	Wed Jan 10 13:41:34 2001
>@@ -0,0 +1,12 @@
>+--- config.h.in.orig	Wed Jan 10 13:40:16 2001
>++++ config.h.in	Wed Jan 10 13:40:52 2001
>+@@ -620,6 +620,9 @@
>+ /* Define if you have the <unistd.h> header file.  */
>+ #undef HAVE_UNISTD_H
>+ 
>++/* Define if you have the <expat.h> header file.  */
>++#undef HAVE_EXPAT_H
>++
>+ /* Define if you have the <utime.h> header file.  */
>+ #undef HAVE_UTIME_H
>+ 
>Index: files/patch-configure
>===================================================================
>RCS file: patch-configure
>diff -N patch-configure
>--- /dev/null	Wed Jan 10 13:43:03 2001
>+++ patch-configure	Wed Jan 10 13:24:05 2001
>@@ -0,0 +1,11 @@
>+--- configure	Wed Jan 10 13:19:29 2001
>++++ configure.orig	Wed Jan 10 13:19:05 2001
>+@@ -1549,7 +1549,7 @@
>+ sys/audioio.h sys/file.h sys/lock.h db_185.h db.h \
>+ sys/param.h sys/select.h sys/socket.h sys/time.h sys/times.h \
>+ sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
>+-ndbm.h db1/ndbm.h gdbm/ndbm.h
>++ndbm.h db1/ndbm.h gdbm/ndbm.h expat.h
>+ do
>+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
>+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

Actions: View | Diff

Attachments on bug 24231: 12577