[gentoo-commits] gentoo-x86 commit in net-analyzer/upnpscan/files: upnpscan-0.4-cflags.patch

[Jeroen Roovers (jer)]

jer         10/11/01 04:17:10

  Modified:             upnpscan-0.4-cflags.patch
  Log:
  Clean up patch (remove LIBTOOL dep and unset CFLAGS in configure.in, extend it (Makefile.am) so we can simply use emake install without trying to install empty/non-existent files, and do not set CFLAGS again (src/Makefile.am). Bug #343333.
  
  (Portage version: 2.1.9.23/cvs/Linux i686)

Revision  Changes    Path
1.2                  net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch?r1=1.1&r2=1.2

Index: upnpscan-0.4-cflags.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/upnpscan/files/upnpscan-0.4-cflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upnpscan-0.4-cflags.patch	15 Jan 2009 07:48:15 -0000	1.1
+++ upnpscan-0.4-cflags.patch	1 Nov 2010 04:17:10 -0000	1.2
@@ -1,20 +1,51 @@
---- 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 @@
+--- 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 = \
+-AM_CFLAGS =\
 -	 -Wall\
 -	 -g
-+	 -Wall
+-
+ bin_PROGRAMS = upnpscan
  
  upnpscan_SOURCES = \
- 	upnpscan.c\