ports/133053: patches to fix ports broken by addition of getdelim() and strndup()

Wed Mar 25 08:10:02 UTC 2009

>Number:         133053
>Category:       ports
>Synopsis:       patches to fix ports broken by addition of getdelim() and strndup()
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 25 08:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     David Schultz
>Release:        FreeBSD 8.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD zim.MIT.EDU 8.0-CURRENT FreeBSD 8.0-CURRENT #0 r189675M: Wed Mar 11 02:05:45 EDT 2009 das at zim.MIT.EDU:/usr/obj/usr/src/head/sys/ZIM amd64


	
>Description:
Most of the changes are straightforward.

It might be worth verifying that the pecomato patches don't
break the port on older releases.
>How-To-Repeat:
	
>Fix:
Index: audio/raop_play/files/patch-aexcl-Makefile.in
===================================================================
RCS file: /home/ncvs/ports/audio/raop_play/files/patch-aexcl-Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-aexcl-Makefile.in

--- audio/raop_play/files/patch-aexcl-Makefile.in	21 May 2008 14:27:08 -0000	1.2
+++ audio/raop_play/files/patch-aexcl-Makefile.in	25 Mar 2009 07:25:29 -0000
@@ -15,7 +15,8 @@
 -GLIB_SUBST=1 # remove this line, if you want to use libglib-2.0
  DESTDIR =
  
- CXXFLAGS += -Wall -D_GNU_SOURCE -I../raop_play -I../rendezvous
+-CXXFLAGS += -Wall -D_GNU_SOURCE -I../raop_play -I../rendezvous
++CXXFLAGS += -Wall -I../raop_play -I../rendezvous
  GLIB = glib-2.0
 -CXXFLAGS += -I/usr/include/$(GLIB) -I/usr/lib/$(GLIB)/include
 -CFLAGS += -Wall -I/usr/include/$(GLIB) -I/usr/lib/$(GLIB)/include -I../raop_play
Index: dns/fastresolve/files/patch-dns-terror::getline.c
===================================================================
RCS file: dns/fastresolve/files/patch-dns-terror::getline.c
diff -N dns/fastresolve/files/patch-dns-terror::getline.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dns/fastresolve/files/patch-dns-terror::getline.c	25 Mar 2009 07:25:29 -0000
@@ -0,0 +1,24 @@
+--- dns-terror/getline.c.orig	2009-03-25 02:34:45.000000000 -0400
++++ dns-terror/getline.c	2009-03-25 02:38:48.000000000 -0400
+@@ -26,6 +26,7 @@
+    is defined.  */
+ #define _GNU_SOURCE	1
+ #include <stdio.h>
++#include <sys/param.h>
+ #include <sys/types.h>
+ 
+ #if defined __GNU_LIBRARY__ && HAVE_GETDELIM
+@@ -134,6 +135,7 @@
+   return ret;
+ }
+ 
++#if __FreeBSD_version < 800067
+ int
+ getline (lineptr, n, stream)
+      char **lineptr;
+@@ -152,4 +154,5 @@
+ {
+   return getstr (lineptr, n, stream, delimiter, 0);
+ }
++#endif	/* __FreeBSD_version < 800067 */
+ #endif
Index: graphics/pecomato/files/patch-Makefile.unix
===================================================================
RCS file: graphics/pecomato/files/patch-Makefile.unix
diff -N graphics/pecomato/files/patch-Makefile.unix
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ graphics/pecomato/files/patch-Makefile.unix	25 Mar 2009 07:25:29 -0000
@@ -0,0 +1,15 @@
+--- Makefile.unix.orig	2009-03-25 03:04:17.000000000 -0400
++++ Makefile.unix	2009-03-25 03:15:45.000000000 -0400
+@@ -27,7 +27,11 @@
+ SRC_PREFIX = $(shell pwd)/dist-src
+ 
+ TARGET	 = $(PRODUCT)
+-OBJECTS	 = main.o gnu-strndup.o gnu-getline.o util.o exif.o iptc.o jfif.o adobe.o tiff.o
++OBJECTS	 = main.o util.o exif.o iptc.o jfif.o adobe.o tiff.o
++NEEDEXT  = $(shell expr $(OSVERSION) \< 800067)
++ifeq ($(NEEDEXT),1)
++OBJECTS += gnu-strndup.o gnu-getline.o
++endif
+ DOC_DEFS = doc/Makefile.defs
+ 
+ 
Index: graphics/pecomato/files/patch-util.h
===================================================================
RCS file: /home/ncvs/ports/graphics/pecomato/files/patch-util.h,v
retrieving revision 1.1
diff -u -r1.1 patch-util.h
--- graphics/pecomato/files/patch-util.h	18 Dec 2006 22:46:30 -0000	1.1
+++ graphics/pecomato/files/patch-util.h	25 Mar 2009 07:25:29 -0000
@@ -1,10 +1,22 @@
---- util.h.orig	Mon Dec 18 20:22:56 2006
-+++ util.h	Mon Dec 18 20:23:03 2006
-@@ -8,6 +8,7 @@
- 
- #ifndef _util_h_
+--- util.h.orig	2007-09-28 12:04:57.000000000 -0400
++++ util.h	2009-03-25 03:18:26.000000000 -0400
+@@ -10,6 +10,7 @@
  #define _util_h_
-+#define _SSIZE_T_DECLARED
  
  
++#include <sys/param.h>
  #include <stdio.h>
+ #include <stdarg.h>
+ 
+@@ -67,9 +68,11 @@
+ #define _SSIZE_T_DECLARED
+ #endif
+ #endif
++#if __FreeBSD_version < 800067
+ #include "gnu-getline.h"
+ #include "gnu-strndup.h"
+ #endif
++#endif
+ 
+ /* Microsoft Windows specific defines */
+ #ifdef OS_WIN32
Index: security/vpnc/files/patch-sysdep.h
===================================================================
RCS file: security/vpnc/files/patch-sysdep.h
diff -N security/vpnc/files/patch-sysdep.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ security/vpnc/files/patch-sysdep.h	25 Mar 2009 07:25:29 -0000
@@ -0,0 +1,13 @@
+--- sysdep.h.orig	2009-03-25 03:28:26.000000000 -0400
++++ sysdep.h	2009-03-25 03:29:18.000000000 -0400
+@@ -86,6 +86,10 @@
+ #define HAVE_FGETLN    1
+ #define HAVE_UNSETENV  1
+ #define HAVE_SETENV    1
++#include <sys/param.h>
++#if __FreeBSD_version >= 800067
++#define	HAVE_GETLINE   1
++#endif
+ #endif
+ 
+ /***************************************************************************/
>Release-Note:
>Audit-Trail:
>Unformatted:

