Date: Thu, 23 Sep 2010 07:25:10 GMT From: Anders F Björklund <afb@rpm5.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/150874: [MAINTAINER] archivers/rpm5: freebsd 6.x, python version Message-ID: <201009230725.o8N7PAVw082990@www.freebsd.org> Resent-Message-ID: <201009230730.o8N7U2Pc076021@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 150874 >Category: ports >Synopsis: [MAINTAINER] archivers/rpm5: freebsd 6.x, python version >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 Sep 23 07:30:02 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Anders F Björklund >Release: 7.3 >Organization: >Environment: >Description: The current port has some build problems on FreeBSD 6.x, and when using WITH_PYTHON with python versions > 2.5... >How-To-Repeat: >Fix: See patch. Patch attached with submission follows: --- Makefile.orig 2010-09-15 20:33:53.000000000 +0200 +++ Makefile 2010-09-22 23:55:20.000000000 +0200 @@ -6,7 +6,7 @@ PORTNAME= rpm PORTVERSION= 5.0.3 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= archivers MASTER_SITES= http://rpm5.org/files/rpm/rpm-5.0/ PATCHFILES= rpm-5.0.3.1.patch @@ -59,6 +59,7 @@ .if defined(WITH_PERL) CONFIGURE_ARGS+=--with-perl +CONFIGURE_ENV+=__PERL=${PERL} USE_PERL5= yes PLIST_SUB+= PERL="" .else @@ -67,7 +68,8 @@ .endif .if defined(WITH_PYTHON) -CONFIGURE_ARGS+=--with-python +CONFIGURE_ARGS+=--with-python=${PYTHON_VER} +CONFIGURE_ENV+=__PYTHON=${PYTHON_CMD} USE_PYTHON= yes PLIST_SUB+= PYTHON="" CPPFLAGS+= -I${PYTHON_INCLUDEDIR} @@ -139,6 +141,13 @@ ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile .endif +.if ${OSVERSION} < 700000 +# on FreeBSD 6.x, <sys/mount.h> first requires <sys/param.h> (for NGROUPS) +post-configure:: + @${REINPLACE_CMD} -e "s:/\* #undef HAVE_SYS_MOUNT_H \*/:#define HAVE_SYS_MOUNT_H 1:" \ + ${WRKSRC}/config.h +.endif + post-build: .if !defined(NOPORTDOCS) ${MAKE} -C ${WRKSRC} apidocs --- /dev/null 2010-09-23 00:11:00.000000000 +0200 +++ files/patch-configure.ac 2010-09-22 23:44:38.000000000 +0200 @@ -0,0 +1,32 @@ +--- configure.ac.orig 2010-09-22 23:22:07.000000000 +0200 ++++ configure.ac 2010-09-22 23:41:59.000000000 +0200 +@@ -809,14 +809,14 @@ + AC_ARG_WITH(python, AS_HELP_STRING([--with-python], [build with RPM Python language bindings]), [ + if test ".$withval" != .no; then + case "$withval" in +- 2.x|2.3|2.4|2.5) ++ 2.x|2.3|2.4|2.5|2.6|2.7) + python_version=$withval + ;; + yes) +- python_version="2.5 2.4 2.3 2.x" ++ python_version="2.7 2.6 2.5 2.4 2.3 2.x" + ;; + *) +- AC_MSG_WARN([--with-python only supports values 2.x, 2.3, 2.4, or 2.5, ignoring...]) ++ AC_MSG_WARN([--with-python only supports values 2.x, 2.3, 2.4, 2.5, 2.6, or 2.7, ignoring...]) + python_version="" + ;; + esac +@@ -894,9 +894,9 @@ + done + fi + AC_ARG_WITH(python-inc-dir, AS_HELP_STRING([--with-python-inc-dir=DIR], [directory with Python include files]), +- [WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="`python -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()'`"]) ++ [WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="`${__PYTHON} -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()'`"]) + AC_ARG_WITH(python-lib-dir, AS_HELP_STRING([--with-python-lib-dir=DIR], [directory with Python library]), +- [WITH_PYTHON_LIBDIR="$withval"], [WITH_PYTHON_LIBDIR="`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`"]) ++ [WITH_PYTHON_LIBDIR="$withval"], [WITH_PYTHON_LIBDIR="`${__PYTHON} -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`"]) + ]) + AC_SUBST(WITH_PYTHON_SUBDIR) + AC_SUBST(WITH_PYTHON_SUBPACKAGE) >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009230725.o8N7PAVw082990>