Attachment #144702 for bug #189879

View | Details | Raw Unified | Return to bug 189879 | Differences between
Collapse All | Expand All





PORTNAME=		krb5
PORTVERSION=		1.12.1
PORTREVISION=		4
CATEGORIES=		security
MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
DISTNAME=		${PORTNAME}-${PORTVERSION}-signed

LATEST_LINK=		${PORTNAME}-19
KERBEROSV_URL=		http://web.mit.edu/kerberos/
USE_PERL5=		build
USE_PYTHON_BUILD=	2.7
USE_LDCONFIG=		yes
USE_CSTD=		gnu99
USE_AUTOTOOLS=		autoconf
USES=			gettext gmake libtool perl5 readline
GNU_CONFIGURE=		yes
CONFIGURE_ARGS?=	--enable-shared --without-system-verto --with-readline
CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC="${YACC}"
MAKE_ARGS=		INSTALL="${INSTALL}"





--- configure.in.orig	2014-01-15 16:44:15.000000000 -0800
+++ configure.in	2014-07-15 08:54:27.139642717 -0700
@@ -1082,7 +1082,7 @@
 AC_CHECK_PROG(PYTHON,python,python)
 HAVE_PYTHON=no
 if test x"$PYTHON" != x; then
-	# k5test.py requires python 2.4 (for the subprocess module).
+	# k5test.py requires python 2.7 (for the subprocess module).
     	vercheck="import sys;sys.exit((sys.hexversion < 0x2040000) and 1 or 0)"
 	if python -c "$vercheck"; then
 		HAVE_PYTHON=yes
@@ -1206,9 +1206,8 @@
 # default, so it's not a big deal that it isn't very good.  We should
 # use python-config instead.
 PYTHON_LIB=
-AC_CHECK_HEADERS(Python.h python2.3/Python.h python2.5/Python.h)
-AC_CHECK_LIB(python2.3,main,[PYTHON_LIB=-lpython2.3],
-  AC_CHECK_LIB(python2.5,main,[PYTHON_LIB=-lpython2.5]))
+AC_CHECK_HEADERS(Python.h python2.7/Python.h)
+AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])
 AC_SUBST(PYTHON_LIB)
 
 

Return to bug 189879

Lines 3-9 Link Here

(-)Makefile (-4 / +6 lines)
3		3
4	PORTNAME= krb5	4	PORTNAME= krb5
5	PORTVERSION= 1.12.1	5	PORTVERSION= 1.12.1
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]\.[0-9]/&X/:C/X\.[0-9]*$//:C/X//}/	8	MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]\.[0-9]/&X/:C/X\.[0-9]*$//:C/X//}/
9	DISTNAME= ${PORTNAME}-${PORTVERSION}-signed	9	DISTNAME= ${PORTNAME}-${PORTVERSION}-signed
Lines 24-34 Link Here
24	LATEST_LINK= ${PORTNAME}-19	24	LATEST_LINK= ${PORTNAME}-19
25	KERBEROSV_URL= http://web.mit.edu/kerberos/	25	KERBEROSV_URL= http://web.mit.edu/kerberos/
26	USE_PERL5= build	26	USE_PERL5= build
		27	USE_PYTHON_BUILD= 2.7
27	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
28	USE_CSTD= gnu99	29	USE_CSTD= gnu99
29	USE_AUTOTOOLS= libtool	30	USE_AUTOTOOLS= autoconf
30	USES= gettext gmake perl5	31	USES= gettext gmake libtool perl5 readline
31	CONFIGURE_ARGS?= --enable-shared --without-system-verto	32	GNU_CONFIGURE= yes
		33	CONFIGURE_ARGS?= --enable-shared --without-system-verto --with-readline
32	CONFIGURE_ENV= INSTALL="${INSTALL}" YACC="${YACC}"	34	CONFIGURE_ENV= INSTALL="${INSTALL}" YACC="${YACC}"
33	MAKE_ARGS= INSTALL="${INSTALL}"	35	MAKE_ARGS= INSTALL="${INSTALL}"
34		36

Line 0 Link Here

(-)files/patch-configure.in (+23 lines)
	1	--- configure.in.orig 2014-01-15 16:44:15.000000000 -0800
	2	+++ configure.in 2014-07-15 08:54:27.139642717 -0700
	3	@@ -1082,7 +1082,7 @@
	4	AC_CHECK_PROG(PYTHON,python,python)
	5	HAVE_PYTHON=no
	6	if test x"$PYTHON" != x; then
	7	- # k5test.py requires python 2.4 (for the subprocess module).
	8	+ # k5test.py requires python 2.7 (for the subprocess module).
	9	vercheck="import sys;sys.exit((sys.hexversion < 0x2040000) and 1 or 0)"
	10	if python -c "$vercheck"; then
	11	HAVE_PYTHON=yes
	12	@@ -1206,9 +1206,8 @@
	13	# default, so it's not a big deal that it isn't very good. We should
	14	# use python-config instead.
	15	PYTHON_LIB=
	16	-AC_CHECK_HEADERS(Python.h python2.3/Python.h python2.5/Python.h)
	17	-AC_CHECK_LIB(python2.3,main,[PYTHON_LIB=-lpython2.3],
	18	- AC_CHECK_LIB(python2.5,main,[PYTHON_LIB=-lpython2.5]))
	19	+AC_CHECK_HEADERS(Python.h python2.7/Python.h)
	20	+AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])
	21	AC_SUBST(PYTHON_LIB)
	22
	23