Date: Thu, 2 Dec 2004 23:31:56 +0100 (CET) From: Christian Laursen <xi@borderworlds.dk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/74631: Update port: misc/pointless - fix build with python 2.4 Message-ID: <20041202223156.25550B8B8@borg.borderworlds.dk> Resent-Message-ID: <200412022240.iB2Me4J8029891@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74631
>Category: ports
>Synopsis: Update port: misc/pointless - fix build with python 2.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 02 22:40:04 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Christian Laursen
>Release: FreeBSD 5.3-RELEASE i386
>Organization:
The Border Worlds
>Environment:
System: FreeBSD borg.borderworlds.dk 5.3-RELEASE FreeBSD 5.3-RELEASE #32: Wed Nov 17 20:27:18 CET 2004 root@borg.borderworlds.dk:/usr/obj/usr/src/sys/BORG i386
>Description:
Python 2.4 broke compilation of pointless. This patch fixes it.
>How-To-Repeat:
>Fix:
--- pointless.diff begins here ---
diff -urN /usr/ports/misc/pointless/Makefile pointless/Makefile
--- /usr/ports/misc/pointless/Makefile Sun Jun 20 15:31:24 2004
+++ pointless/Makefile Thu Dec 2 23:27:40 2004
@@ -29,8 +29,8 @@
USE_GL= yes
USE_PYTHON= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS+= --prefix=${PREFIX}
+USE_AUTOCONF_VER= 259
+CONFIGURE_ARGS+= --prefix=${PREFIX} --program-transform-name=""
CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib/${PYTHON_VERSION}/config/
MAN1= pointless.1
diff -urN /usr/ports/misc/pointless/files/patch-python24 pointless/files/patch-python24
--- /usr/ports/misc/pointless/files/patch-python24 Thu Jan 1 01:00:00 1970
+++ pointless/files/patch-python24 Thu Dec 2 23:27:40 2004
@@ -0,0 +1,53 @@
+diff -urN pointless-0.5.orig/config.h.in pointless-0.5/config.h.in
+--- pointless-0.5.orig/config.h.in Tue Jan 27 21:35:08 2004
++++ config.h.in Thu Dec 2 17:14:28 2004
+@@ -199,6 +199,9 @@
+ /* Define as 1 if you have libpython2.3 */
+ #undef HAVE_PYTHON2_3
+
++/* Define as 1 if you have libpython2.4 */
++#undef HAVE_PYTHON2_4
++
+ /* Define as 1 if you have libsdl */
+ #undef HAVE_SDL
+
+diff -urN pointless-0.5.orig/configure.in pointless-0.5/configure.in
+--- pointless-0.5.orig/configure.in Sat Jan 24 15:17:50 2004
++++ configure.in Thu Dec 2 17:13:59 2004
+@@ -517,6 +517,12 @@
+ if test x$PYTHON_VERSION = x2.3; then
+ AC_DEFINE([HAVE_PYTHON2_3])
+ fi
++AH_TEMPLATE([HAVE_PYTHON2_4],
++ [Define as 1 if you have libpython2.4])
++AM_PATH_PYTHON_DEV
++if test x$PYTHON_VERSION = x2.4; then
++ AC_DEFINE([HAVE_PYTHON2_4])
++fi
+
+ # *****************************************************************************
+ # Checks for typedefs, structures, and compiler characteristics.
+diff -urN pointless-0.5.orig/src/nodecontroller.h pointless-0.5/src/nodecontroller.h
+--- pointless-0.5.orig/src/nodecontroller.h Tue Dec 16 23:33:21 2003
++++ src/nodecontroller.h Thu Dec 2 16:50:16 2004
+@@ -34,6 +34,8 @@
+ # include <python2.2/Python.h>
+ #elif HAVE_PYTHON2_3
+ # include <python2.3/Python.h>
++#elif HAVE_PYTHON2_4
++# include <python2.4/Python.h>
+ #endif
+
+ #include "common.h"
+diff -urN pointless-0.5.orig/src/pointless_wrap.cpp pointless-0.5/src/pointless_wrap.cpp
+--- pointless-0.5.orig/src/pointless_wrap.cpp Tue Jan 6 22:18:36 2004
++++ src/pointless_wrap.cpp Thu Dec 2 16:50:44 2004
+@@ -42,6 +42,8 @@
+ # endif
+ #elif HAVE_PYTHON2_3
+ # include <python2.3/Python.h>
++#elif HAVE_PYTHON2_4
++# include <python2.4/Python.h>
+ #endif
+
+ #ifndef HAVE_SDL
--- pointless.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041202223156.25550B8B8>