Sat Dec 20 18:08:07 2008 UTC ()
Don't use -O6 and -O3 because some gcc versions choke.
>From Bernd Ernesti in private mail.


(gdt)
diff -r1.9 -r1.10 pkgsrc/print/gutenprint-lib/Makefile
diff -r1.2 -r1.3 pkgsrc/print/gutenprint-lib/distinfo
diff -r0 -r1.1 pkgsrc/print/gutenprint-lib/patches/patch-ab
cvs diff -r1.9 -r1.10 pkgsrc/print/gutenprint-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/print/gutenprint-lib/Makefile 2008/12/20 15:57:02 1.9
+++ pkgsrc/print/gutenprint-lib/Makefile 2008/12/20 18:08:07 1.10
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.9 2008/12/20 15:57:02 gdt Exp $ 1# $NetBSD: Makefile,v 1.10 2008/12/20 18:08:07 gdt Exp $
2 2
3VERSION= 5.2.2 3VERSION= 5.2.2
4DISTNAME= gutenprint-${VERSION} 4DISTNAME= gutenprint-${VERSION}
5EXTRACT_SUFX= .tar.bz2 5EXTRACT_SUFX= .tar.bz2
6PKGNAME= gutenprint-lib-${VERSION} 6PKGNAME= gutenprint-lib-${VERSION}
7PKGREVISION= 2 7PKGREVISION= 3
8CATEGORIES= print 8CATEGORIES= print
9MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/} 9MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
10 10
11MAINTAINER= gdt@NetBSD.org 11MAINTAINER= gdt@NetBSD.org
12COMMENT= Drivers for Canon, Epson, Lexmark, and PCL printers 12COMMENT= Drivers for Canon, Epson, Lexmark, and PCL printers
13HOMEPAGE= http://gutenprint.sourceforge.net/ 13HOMEPAGE= http://gutenprint.sourceforge.net/
14 14
15INSTALLVERSION= 5.2 15INSTALLVERSION= 5.2
16PLIST_SUBST+= INSTALLVERSION=${INSTALLVERSION} 16PLIST_SUBST+= INSTALLVERSION=${INSTALLVERSION}
17 17
18PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
19 19
20# Not sure if this works. 20# Not sure if this works.
cvs diff -r1.2 -r1.3 pkgsrc/print/gutenprint-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/print/gutenprint-lib/distinfo 2008/12/20 00:54:17 1.2
+++ pkgsrc/print/gutenprint-lib/distinfo 2008/12/20 18:08:07 1.3
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.2 2008/12/20 00:54:17 gdt Exp $ 1$NetBSD: distinfo,v 1.3 2008/12/20 18:08:07 gdt Exp $
2 2
3SHA1 (gutenprint-5.2.2.tar.bz2) = 0efaadf2db4c67ecb66e79f5405315975dd1d11b 3SHA1 (gutenprint-5.2.2.tar.bz2) = 0efaadf2db4c67ecb66e79f5405315975dd1d11b
4RMD160 (gutenprint-5.2.2.tar.bz2) = eac1ce4304f044e9aadfc4081c0408f038f685bd 4RMD160 (gutenprint-5.2.2.tar.bz2) = eac1ce4304f044e9aadfc4081c0408f038f685bd
5Size (gutenprint-5.2.2.tar.bz2) = 4913895 bytes 5Size (gutenprint-5.2.2.tar.bz2) = 4913895 bytes
6SHA1 (patch-aa) = b085bcf736d230c7f05d7b27bd1831165f958579 6SHA1 (patch-aa) = b085bcf736d230c7f05d7b27bd1831165f958579
 7SHA1 (patch-ab) = aa773c2c0789995df28b5533bf8b93cec8be6ec8
File Added: pkgsrc/print/gutenprint-lib/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.1 2008/12/20 18:08:07 gdt Exp $

--- ./configure.orig	2008-11-14 13:49:21.000000000 +0100
+++ ./configure	2008-12-19 21:23:35.000000000 +0100
@@ -26682,7 +26682,7 @@
 
   else
 
-  for stp_ac_arg in -O6 -O3 -O2 -O1 -O ; do
+  for stp_ac_arg in -O2 -O1 -O ; do
     stp_ac_save_CFLAGS="${CFLAGS}"
 
   { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
@@ -31879,6 +31879,8 @@
   case $ac_option in
   # Handling of the options.
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+	: Avoid regenerating within pkgsrc
+	exit 0
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     echo "$ac_cs_version"; exit ;;