[csw-devel] SF.net SVN: gar:[21756] csw/mgar/pkg/netpbm/trunk

[lblume at users.sourceforge.net]

Revision: 21756
          http://gar.svn.sourceforge.net/gar/?rev=21756&view=rev
Author:   lblume
Date:     2013-08-17 10:31:35 +0000 (Sat, 17 Aug 2013)
Log Message:
-----------
netpbm/trunk: Some cleanup

Modified Paths:
--------------
    csw/mgar/pkg/netpbm/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/netpbm/trunk/files/0006-memcpy_stdlib.patch

Removed Paths:
-------------
    csw/mgar/pkg/netpbm/trunk/files/0006-memcpy.patch

Modified: csw/mgar/pkg/netpbm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netpbm/trunk/Makefile	2013-08-17 09:02:06 UTC (rev 21755)
+++ csw/mgar/pkg/netpbm/trunk/Makefile	2013-08-17 10:31:35 UTC (rev 21756)
@@ -19,8 +19,8 @@
 
 EXPANDVARS += config.mk
 
-PATCHFILES += 0005_missing_stdlib.h.patch
-PATCHFILES += 0006-memcpy.patch
+#PATCHFILES += 0005_missing_stdlib.h.patch
+PATCHFILES += 0006-memcpy_stdlib.patch
 PATCHFILES += 0007_stdout_already_used.patch
 
 VENDOR_URL = http://netpbm.sourceforge.net/

Deleted: csw/mgar/pkg/netpbm/trunk/files/0006-memcpy.patch
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/0006-memcpy.patch	2013-08-17 09:02:06 UTC (rev 21755)
+++ csw/mgar/pkg/netpbm/trunk/files/0006-memcpy.patch	2013-08-17 10:31:35 UTC (rev 21756)
@@ -1,23 +0,0 @@
---- a/pm_config.in.h	ven. août 16 23:48:28 2013
-+++ b/pm_config.in.h	ven. août 16 23:51:30 2013
-@@ -91,9 +91,11 @@
- 
- #ifndef __SASC
- #ifndef _DCC    /* Amiga DICE Compiler */
-+#ifndef sun    /* Solaris */
- #define bzero(dst,len) memset(dst,0,len)
- #define bcopy(src,dst,len) memcpy(dst,src,len)
- #define bcmp memcmp
-+#endif /* sun */
- #endif /* _DCC */
- #endif /* __SASC */
- 
-@@ -93,7 +93,7 @@
- ** If you have compilation problems that point here, feel free to tweak
- ** or remove these declarations.
- */
--#ifdef BSD
-+#if defined(BSD) || defined(sun)
- #include <stdlib.h>
- #endif
- #if defined(SYSV)

Copied: csw/mgar/pkg/netpbm/trunk/files/0006-memcpy_stdlib.patch (from rev 21753, csw/mgar/pkg/netpbm/trunk/files/0006-memcpy.patch)
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/0006-memcpy_stdlib.patch	                        (rev 0)
+++ csw/mgar/pkg/netpbm/trunk/files/0006-memcpy_stdlib.patch	2013-08-17 10:31:35 UTC (rev 21756)
@@ -0,0 +1,23 @@
+--- a/pm_config.in.h	ven. août 16 23:48:28 2013
++++ b/pm_config.in.h	ven. août 16 23:51:30 2013
+@@ -91,9 +91,11 @@
+ 
+ #ifndef __SASC
+ #ifndef _DCC    /* Amiga DICE Compiler */
++#ifndef sun    /* Solaris */
+ #define bzero(dst,len) memset(dst,0,len)
+ #define bcopy(src,dst,len) memcpy(dst,src,len)
+ #define bcmp memcmp
++#endif /* sun */
+ #endif /* _DCC */
+ #endif /* __SASC */
+ 
+@@ -93,7 +93,7 @@
+ ** If you have compilation problems that point here, feel free to tweak
+ ** or remove these declarations.
+ */
+-#ifdef BSD
++#if defined(BSD) || defined(sun)
+ #include <stdlib.h>
+ #endif
+ #if defined(SYSV)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.