From 8a0ce7cad5eeab8b22c2b0edff947fc34e97e188 Mon Sep 17 00:00:00 2001 From: merdely Date: Mon, 28 Jan 2008 15:19:16 +0000 Subject: [PATCH] Make tktable honor our CFLAGS and not hardcode -O. Fixes build on alpha. ok naddy, kevlo (MAINTAINER) --- x11/tktable/Makefile | 7 ++++--- x11/tktable/patches/patch-configure | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/x11/tktable/Makefile b/x11/tktable/Makefile index c7206187339..c1e4b4047a2 100644 --- a/x11/tktable/Makefile +++ b/x11/tktable/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.17 2007/09/15 20:04:25 merdely Exp $ +# $OpenBSD: Makefile,v 1.18 2008/01/28 15:19:16 merdely Exp $ COMMENT= tk extension -DISTNAME= Tktable2.9 -PKGNAME= Tktable-2.9 +V= 2.9 +DISTNAME= Tktable$V +PKGNAME= Tktable-$Vp0 SHARED_LIBS= Tktable29 1.0 CATEGORIES= x11 diff --git a/x11/tktable/patches/patch-configure b/x11/tktable/patches/patch-configure index 04c67299885..ffd010dbe9e 100644 --- a/x11/tktable/patches/patch-configure +++ b/x11/tktable/patches/patch-configure @@ -1,7 +1,15 @@ -$OpenBSD: patch-configure,v 1.1 2006/01/08 20:56:08 naddy Exp $ ---- configure.orig Sun Jan 8 21:04:29 2006 -+++ configure Sun Jan 8 21:05:15 2006 -@@ -8600,11 +8600,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& +$OpenBSD: patch-configure,v 1.2 2008/01/28 15:19:17 merdely Exp $ +--- configure.orig Thu Jul 22 12:43:15 2004 ++++ configure Wed Jan 23 09:55:43 2008 +@@ -7337,7 +7337,6 @@ fi + ECHO_VERSION='`echo ${PACKAGE_VERSION}`' + TCL_LIB_VERSIONS_OK=ok + CFLAGS_DEBUG=-g +- CFLAGS_OPTIMIZE=-O + if test "$GCC" = "yes" ; then + CFLAGS_WARNING="-Wall -Wno-implicit-int" + else +@@ -8600,11 +8599,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "yes" >/dev/null 2>&1; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6