summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2010-11-01 04:32:45 +0000
committerJeroen Roovers <jer@gentoo.org>2010-11-01 04:32:45 +0000
commitf783c5766ff39b126e3696f97cc0d60995f23f96 (patch)
treee7cb33bb8b49195843da451290cd9bb4ce1344c9 /net-analyzer/upnpscan/files
parentClean up patch (remove LIBTOOL dep and unset CFLAGS in configure.in, extend i... (diff)
downloadhistorical-f783c5766ff39b126e3696f97cc0d60995f23f96.tar.gz
historical-f783c5766ff39b126e3696f97cc0d60995f23f96.tar.bz2
historical-f783c5766ff39b126e3696f97cc0d60995f23f96.zip
Readd the old patch or we introduce more QA issues to -r0.
Package-Manager: portage-2.1.9.23/cvs/Linux i686
Diffstat (limited to 'net-analyzer/upnpscan/files')
-rw-r--r--net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch59
-rw-r--r--net-analyzer/upnpscan/files/upnpscan-0.4-r2-cflags.patch51
2 files changed, 65 insertions, 45 deletions
diff --git a/net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch b/net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch
index 46be9888ec7c..f7632d7f005b 100644
--- a/net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch
+++ b/net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch
@@ -1,51 +1,20 @@
---- a/configure.in 2005-06-23 17:02:57.000000000 +0200
-+++ b/configure.in 2010-11-01 04:44:44.000000000 +0100
-@@ -8,12 +8,10 @@
- AM_CONFIG_HEADER(config.h)
-
- AC_ISC_POSIX
--CFLAGS=""
- AC_SUBST(CFLAGS)
- AC_PROG_CC
- AM_PROG_CC_STDC
- AC_HEADER_STDC
--AM_PROG_LIBTOOL
-
- dnl Checks for programs.
-
---- a/Makefile.am 2005-06-23 12:32:13.000000000 +0200
-+++ b/Makefile.am 2010-11-01 04:46:41.000000000 +0100
-@@ -5,20 +5,6 @@
-
- SUBDIRS = src
-
--upnpscandocdir = ${prefix}/doc/upnpscan
--upnpscandoc_DATA = \
-- README\
-- COPYING\
-- AUTHORS\
-- ChangeLog\
-- INSTALL\
-- NEWS\
-- TODO
--
--EXTRA_DIST = $(upnpscandoc_DATA)
--
--
--
- # Copy all the spec files. Of cource, only one is actually used.
- dist-hook:
- for specfile in *.spec; do \
---- a/src/Makefile.am 2005-06-21 22:57:32.000000000 +0200
-+++ b/src/Makefile.am 2010-11-01 04:53:22.000000000 +0100
-@@ -7,10 +7,6 @@
- INCLUDES =\
+--- upnpscan/src/Makefile.in.orig 2005-06-23 17:03:51.000000000 +0200
++++ upnpscan/src/Makefile.in 2009-01-15 08:42:52.000000000 +0100
+@@ -82,7 +82,6 @@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -181,8 +180,7 @@
-I../include
--AM_CFLAGS =\
+ AM_CFLAGS = \
- -Wall\
- -g
--
- bin_PROGRAMS = upnpscan
++ -Wall
upnpscan_SOURCES = \
+ upnpscan.c\
diff --git a/net-analyzer/upnpscan/files/upnpscan-0.4-r2-cflags.patch b/net-analyzer/upnpscan/files/upnpscan-0.4-r2-cflags.patch
new file mode 100644
index 000000000000..46be9888ec7c
--- /dev/null
+++ b/net-analyzer/upnpscan/files/upnpscan-0.4-r2-cflags.patch
@@ -0,0 +1,51 @@
+--- a/configure.in 2005-06-23 17:02:57.000000000 +0200
++++ b/configure.in 2010-11-01 04:44:44.000000000 +0100
+@@ -8,12 +8,10 @@
+ AM_CONFIG_HEADER(config.h)
+
+ AC_ISC_POSIX
+-CFLAGS=""
+ AC_SUBST(CFLAGS)
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+-AM_PROG_LIBTOOL
+
+ dnl Checks for programs.
+
+--- a/Makefile.am 2005-06-23 12:32:13.000000000 +0200
++++ b/Makefile.am 2010-11-01 04:46:41.000000000 +0100
+@@ -5,20 +5,6 @@
+
+ SUBDIRS = src
+
+-upnpscandocdir = ${prefix}/doc/upnpscan
+-upnpscandoc_DATA = \
+- README\
+- COPYING\
+- AUTHORS\
+- ChangeLog\
+- INSTALL\
+- NEWS\
+- TODO
+-
+-EXTRA_DIST = $(upnpscandoc_DATA)
+-
+-
+-
+ # Copy all the spec files. Of cource, only one is actually used.
+ dist-hook:
+ for specfile in *.spec; do \
+--- a/src/Makefile.am 2005-06-21 22:57:32.000000000 +0200
++++ b/src/Makefile.am 2010-11-01 04:53:22.000000000 +0100
+@@ -7,10 +7,6 @@
+ INCLUDES =\
+ -I../include
+
+-AM_CFLAGS =\
+- -Wall\
+- -g
+-
+ bin_PROGRAMS = upnpscan
+
+ upnpscan_SOURCES = \