aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authornaddy <naddy@FreeBSD.org>2003-06-25 07:39:42 +0800
committernaddy <naddy@FreeBSD.org>2003-06-25 07:39:42 +0800
commitccc1fda87b6f785a033fcd917143ec4a26ca7a59 (patch)
tree0b5bc46b8ce9568447d1d026d09e394f41d616d5 /net
parent03b6edd7c330195dc9aca8f5b64050047dd33c7b (diff)
downloadfreebsd-ports-gnome-ccc1fda87b6f785a033fcd917143ec4a26ca7a59.tar.gz
freebsd-ports-gnome-ccc1fda87b6f785a033fcd917143ec4a26ca7a59.tar.zst
freebsd-ports-gnome-ccc1fda87b6f785a033fcd917143ec4a26ca7a59.zip
Fix CFLAGS handling in Makefile.am/.in.
PR: 53135 Reported by: Sergey Akifyev <asa@gascom.ru>
Diffstat (limited to 'net')
-rw-r--r--net/poptop/files/patch-ab9
-rw-r--r--net/poptop/files/patch-ac9
2 files changed, 12 insertions, 6 deletions
diff --git a/net/poptop/files/patch-ab b/net/poptop/files/patch-ab
index a470af757529..61ee35c674c8 100644
--- a/net/poptop/files/patch-ab
+++ b/net/poptop/files/patch-ab
@@ -1,11 +1,14 @@
---- Makefile.in.orig Sat May 3 17:54:08 2003
-+++ Makefile.in Sat May 3 17:55:08 2003
+
+$FreeBSD$
+
+--- Makefile.in.orig Thu Feb 27 16:41:21 2003
++++ Makefile.in Wed Jun 25 01:35:11 2003
@@ -75,7 +75,7 @@
AUTOMAKE_OPTIONS = no-dependencies foreign
INCLUDES = -I.
-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
-+CFLAGS+= -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"'
++CFLAGS= @CFLAGS@ -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"'
#CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
#CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
diff --git a/net/poptop/files/patch-ac b/net/poptop/files/patch-ac
index b8afbd1d8efb..a07f21eb17b9 100644
--- a/net/poptop/files/patch-ac
+++ b/net/poptop/files/patch-ac
@@ -1,11 +1,14 @@
---- Makefile.am.orig Sat May 3 17:55:55 2003
-+++ Makefile.am Sat May 3 17:56:22 2003
+
+$FreeBSD$
+
+--- Makefile.am.orig Thu Feb 27 16:41:20 2003
++++ Makefile.am Wed Jun 25 01:34:22 2003
@@ -11,7 +11,7 @@
## warning with -Wmissing-prototypes).
## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers
## aren't up to it).
-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
-+CFLAGS = ${CFLAGS} -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"'
++CFLAGS = @CFLAGS@ -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"'
#CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
#CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'