From e2aedd8abd3ca3fb06e9a7ca9ccb01278ff31386 Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sun, 27 Jul 2014 15:27:04 +0000
Subject: Start cleaning up some of the uselessly ambigious patches named
 patch-xy, and giving them proper names.

---
 archivers/zip/files/patch-aa             | 35 --------------------------------
 archivers/zip/files/patch-ab             | 20 ------------------
 archivers/zip/files/patch-unix_Makefile  | 20 ++++++++++++++++++
 archivers/zip/files/patch-unix_configure | 35 ++++++++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 55 deletions(-)
 delete mode 100644 archivers/zip/files/patch-aa
 delete mode 100644 archivers/zip/files/patch-ab
 create mode 100644 archivers/zip/files/patch-unix_Makefile
 create mode 100644 archivers/zip/files/patch-unix_configure

(limited to 'archivers/zip')

diff --git a/archivers/zip/files/patch-aa b/archivers/zip/files/patch-aa
deleted file mode 100644
index adcc2c41e3cf..000000000000
--- a/archivers/zip/files/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
---- unix/configure.orig	2008-06-19 23:32:20.000000000 +0400
-+++ unix/configure	2008-08-03 06:35:03.000000000 +0400
-@@ -98,7 +98,6 @@
- _EOF_
-       $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
-       if test $? -eq 0; then
--        CFLAGS_OPT='-O3'
-         echo "  GNU C ($CFLAGS_OPT)"
-         # Special Mac OS X shared library "ld" option?
-         if test ` uname -s 2> /dev/null ` = 'Darwin'; then
-@@ -110,7 +109,6 @@
-           rm -f conftest
-         fi
-       else
--        CFLAGS_OPT='-O'
-         echo "  Other-unknown C ($CFLAGS_OPT)"
-       fi
-     fi
-@@ -224,7 +222,6 @@
- [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
- [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
- [ -f /lib/cpp ] && CPP=/lib/cpp
--[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
- [ -f /xenix ] && CPP="${CC} -E"
- [ -f /lynx.os ] && CPP="${CC} -E"
- 
-@@ -244,7 +241,7 @@
-     echo "int foo() { return 0;}" > conftest.c
-     $CC -c conftest.c >/dev/null 2>/dev/null
-     echo Check if compiler generates underlines
--    nm conftest.o | grep "(^|[^_])foo" >/dev/null 2>/dev/null
-+    nm conftest.o | egrep "(^|[^_])foo" >/dev/null 2>/dev/null
-     [ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE"
-     if eval "$CPP crc_i386.S > _crc_i386.s 2>/dev/null"; then
-       if eval "$CC -c _crc_i386.s >/dev/null 2>/dev/null" && [ -f _crc_i386.o ]
diff --git a/archivers/zip/files/patch-ab b/archivers/zip/files/patch-ab
deleted file mode 100644
index c466c97973f2..000000000000
--- a/archivers/zip/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- unix/Makefile.orig	2008-05-07 02:33:56.000000000 +0400
-+++ unix/Makefile	2008-08-03 06:36:20.000000000 +0400
-@@ -22,7 +22,6 @@
- LN = ln -s
- 
- # (to use the GNU compiler, change cc to gcc in CC)
--CC = cc
- BIND = $(CC)
- AS = $(CC) -c
- CPP = /lib/cpp
-@@ -57,8 +56,7 @@
- #   CFLAGS    flags for C compile
- #   LFLAGS1   flags after output file spec, before obj file list
- #   LFLAGS2   flags after obj file list (libraries, etc)
--CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
--CFLAGS = -O2 $(CFLAGS_NOOPT)
-+CFLAGS_NOOPT = $(CFLAGS) -I. -DUNIX $(LOCAL_ZIP)
- LFLAGS1 =
- LFLAGS2 = -s
- 
diff --git a/archivers/zip/files/patch-unix_Makefile b/archivers/zip/files/patch-unix_Makefile
new file mode 100644
index 000000000000..c466c97973f2
--- /dev/null
+++ b/archivers/zip/files/patch-unix_Makefile
@@ -0,0 +1,20 @@
+--- unix/Makefile.orig	2008-05-07 02:33:56.000000000 +0400
++++ unix/Makefile	2008-08-03 06:36:20.000000000 +0400
+@@ -22,7 +22,6 @@
+ LN = ln -s
+ 
+ # (to use the GNU compiler, change cc to gcc in CC)
+-CC = cc
+ BIND = $(CC)
+ AS = $(CC) -c
+ CPP = /lib/cpp
+@@ -57,8 +56,7 @@
+ #   CFLAGS    flags for C compile
+ #   LFLAGS1   flags after output file spec, before obj file list
+ #   LFLAGS2   flags after obj file list (libraries, etc)
+-CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
+-CFLAGS = -O2 $(CFLAGS_NOOPT)
++CFLAGS_NOOPT = $(CFLAGS) -I. -DUNIX $(LOCAL_ZIP)
+ LFLAGS1 =
+ LFLAGS2 = -s
+ 
diff --git a/archivers/zip/files/patch-unix_configure b/archivers/zip/files/patch-unix_configure
new file mode 100644
index 000000000000..adcc2c41e3cf
--- /dev/null
+++ b/archivers/zip/files/patch-unix_configure
@@ -0,0 +1,35 @@
+--- unix/configure.orig	2008-06-19 23:32:20.000000000 +0400
++++ unix/configure	2008-08-03 06:35:03.000000000 +0400
+@@ -98,7 +98,6 @@
+ _EOF_
+       $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
+       if test $? -eq 0; then
+-        CFLAGS_OPT='-O3'
+         echo "  GNU C ($CFLAGS_OPT)"
+         # Special Mac OS X shared library "ld" option?
+         if test ` uname -s 2> /dev/null ` = 'Darwin'; then
+@@ -110,7 +109,6 @@
+           rm -f conftest
+         fi
+       else
+-        CFLAGS_OPT='-O'
+         echo "  Other-unknown C ($CFLAGS_OPT)"
+       fi
+     fi
+@@ -224,7 +222,6 @@
+ [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
+ [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
+ [ -f /lib/cpp ] && CPP=/lib/cpp
+-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
+ [ -f /xenix ] && CPP="${CC} -E"
+ [ -f /lynx.os ] && CPP="${CC} -E"
+ 
+@@ -244,7 +241,7 @@
+     echo "int foo() { return 0;}" > conftest.c
+     $CC -c conftest.c >/dev/null 2>/dev/null
+     echo Check if compiler generates underlines
+-    nm conftest.o | grep "(^|[^_])foo" >/dev/null 2>/dev/null
++    nm conftest.o | egrep "(^|[^_])foo" >/dev/null 2>/dev/null
+     [ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE"
+     if eval "$CPP crc_i386.S > _crc_i386.s 2>/dev/null"; then
+       if eval "$CC -c _crc_i386.s >/dev/null 2>/dev/null" && [ -f _crc_i386.o ]
-- 
cgit v1.2.3