From b8dac3f50ab9ac96496fb44f98fb2fcbbee24419 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 17 Oct 2010 00:39:32 +0000 Subject: Recognize newer python versions. Fixed in upstream git, slightly differently. PKGREVISION++ While here, add comment to patch and please pkglint. --- devel/automake/Makefile | 5 +++-- devel/automake/distinfo | 5 +++-- devel/automake/patches/patch-aa | 4 +++- devel/automake/patches/patch-ab | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 devel/automake/patches/patch-ab (limited to 'devel/automake') diff --git a/devel/automake/Makefile b/devel/automake/Makefile index 199d9bc166f..e357bd66fa7 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.75 2009/12/09 14:39:18 wiz Exp $ +# $NetBSD: Makefile,v 1.76 2010/10/17 00:39:32 wiz Exp $ # DISTNAME= automake-1.11.1 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=automake/} \ ftp://sources.redhat.com/pub/automake/ @@ -21,7 +22,7 @@ USE_TOOLS+= gm4:run perl:run PLIST_SUBST+= PKG_DIR_VERSION=1.11 GNU_CONFIGURE= YES _STRIPFLAG_INSTALL= # none -INFO_FILES= # PLIST +INFO_FILES= YES # doesn't work because buildlink3 hides scripts # from autoconf too well diff --git a/devel/automake/distinfo b/devel/automake/distinfo index 3d981f83759..d9844b7c8ba 100644 --- a/devel/automake/distinfo +++ b/devel/automake/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.31 2009/12/09 14:39:18 wiz Exp $ +$NetBSD: distinfo,v 1.32 2010/10/17 00:39:32 wiz Exp $ SHA1 (automake-1.11.1.tar.bz2) = 44ab0007d8edbe82338e29bdda2f461f43a98818 RMD160 (automake-1.11.1.tar.bz2) = 0d160a06a022b145095c6433c3f0511ec5a8c6fd Size (automake-1.11.1.tar.bz2) = 1066685 bytes -SHA1 (patch-aa) = 5faa883609df5432dd0516e472587f191bc58ba4 +SHA1 (patch-aa) = 9a31e63f2b197343f8f881808b470249f1d6d8b1 +SHA1 (patch-ab) = be70335031f90c803de709d504780a70a433e272 diff --git a/devel/automake/patches/patch-aa b/devel/automake/patches/patch-aa index 2698ebc4c3d..70ebae1f667 100644 --- a/devel/automake/patches/patch-aa +++ b/devel/automake/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.7 2004/09/28 09:38:17 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2010/10/17 00:39:33 wiz Exp $ + +Stop unnecessary regeneration of files. --- doc/Makefile.in.orig 2004-09-19 23:40:13.000000000 +0200 +++ doc/Makefile.in diff --git a/devel/automake/patches/patch-ab b/devel/automake/patches/patch-ab new file mode 100644 index 00000000000..e8e7ff651e6 --- /dev/null +++ b/devel/automake/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.5 2010/10/17 00:39:33 wiz Exp $ + +Recognize newer python versions. Fixed in upstream git, slightly differently. + +--- m4/python.m4.orig 2009-12-08 18:02:32.000000000 +0000 ++++ m4/python.m4 +@@ -37,7 +37,7 @@ AC_DEFUN([AM_PATH_PYTHON], + dnl Find a Python interpreter. Python versions prior to 2.0 are not + dnl supported. (2.0 was released on October 16, 2000). + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], +- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl ++ [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl + python2.1 python2.0]) + + m4_if([$1],[],[ -- cgit v1.2.3