From 08a006d08a4c35d2c3ecc9a3d10cf7fd14661a84 Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Tue, 29 Jul 2014 17:12:47 +0000
Subject: Rename all patches that contain '::' as a path separator, and use
 '__' instead.

---
 devel/pwlib/files/patch-make::lib.mak | 51 -----------------------------------
 devel/pwlib/files/patch-make__lib.mak | 51 +++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 devel/pwlib/files/patch-make::lib.mak
 create mode 100644 devel/pwlib/files/patch-make__lib.mak

(limited to 'devel/pwlib')

diff --git a/devel/pwlib/files/patch-make::lib.mak b/devel/pwlib/files/patch-make::lib.mak
deleted file mode 100644
index c5098242f269..000000000000
--- a/devel/pwlib/files/patch-make::lib.mak
+++ /dev/null
@@ -1,51 +0,0 @@
-
-$FreeBSD$
-
---- make/lib.mak
-+++ make/lib.mak
-@@ -130,12 +127,18 @@
- #
- 
- ifneq ($(OSTYPE),Darwin)
--  LIBNAME_MAJ	= $(LIB_FILENAME).$(MAJOR_VERSION)
--  LIBNAME_MIN	= $(LIBNAME_MAJ).$(MINOR_VERSION)
--  ifeq ($(BUILD_TYPE),.)
--    LIBNAME_PAT	= $(LIBNAME_MIN).$(BUILD_NUMBER)
-+  ifeq ($(OSTYPE),FreeBSD)
-+    LIBNAME_MAJ   = $(LIB_FILENAME).$(MAJOR_VERSION)
-+    LIBNAME_MIN   = $(LIBNAME_MAJ)
-+    LIBNAME_PAT   = $(LIBNAME_MAJ)
-   else
--    LIBNAME_PAT	= $(LIBNAME_MIN)-$(BUILD_TYPE)$(BUILD_NUMBER)
-+    LIBNAME_MAJ	= $(LIB_FILENAME).$(MAJOR_VERSION)
-+    LIBNAME_MIN	= $(LIBNAME_MAJ).$(MINOR_VERSION)
-+    ifeq ($(BUILD_TYPE),.)
-+      LIBNAME_PAT	= $(LIBNAME_MIN).$(BUILD_NUMBER)
-+    else
-+      LIBNAME_PAT	= $(LIBNAME_MIN)-$(BUILD_TYPE)$(BUILD_NUMBER)
-+    endif
-   endif
- else
-   LIBNAME_MAJ	= $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(LIB_SUFFIX),$(LIB_FILENAME))
-@@ -212,8 +215,10 @@
- 
-   $(LIBDIR)/$(LIB_FILENAME): $(LIBDIR)/$(LIBNAME_PAT)
- 	cd $(LIBDIR) ; rm -f $(LIB_FILENAME) ; ln -sf $(LIBNAME_PAT) $(LIB_FILENAME)
-+ifneq ($(OSTYPE),FreeBSD)
- 	cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ;  ln -sf $(LIBNAME_PAT) $(LIBNAME_MAJ)
- 	cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ;  ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN)
-+endif
- 
-   $(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_FILE)
- 	@echo EXTLIBS = $(EXTLIBS)
-@@ -224,8 +229,10 @@
-   install: $(LIBDIR)/$(LIBNAME_PAT)
- 	$(INSTALL) $(LIBDIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_PAT)
- 	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_FILENAME)
-+ifneq ($(OSTYPE),FreeBSD)
- 	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ)
- 	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN)
-+endif
- 
- endif # P_SHAREDLIB
- 
diff --git a/devel/pwlib/files/patch-make__lib.mak b/devel/pwlib/files/patch-make__lib.mak
new file mode 100644
index 000000000000..c5098242f269
--- /dev/null
+++ b/devel/pwlib/files/patch-make__lib.mak
@@ -0,0 +1,51 @@
+
+$FreeBSD$
+
+--- make/lib.mak
++++ make/lib.mak
+@@ -130,12 +127,18 @@
+ #
+ 
+ ifneq ($(OSTYPE),Darwin)
+-  LIBNAME_MAJ	= $(LIB_FILENAME).$(MAJOR_VERSION)
+-  LIBNAME_MIN	= $(LIBNAME_MAJ).$(MINOR_VERSION)
+-  ifeq ($(BUILD_TYPE),.)
+-    LIBNAME_PAT	= $(LIBNAME_MIN).$(BUILD_NUMBER)
++  ifeq ($(OSTYPE),FreeBSD)
++    LIBNAME_MAJ   = $(LIB_FILENAME).$(MAJOR_VERSION)
++    LIBNAME_MIN   = $(LIBNAME_MAJ)
++    LIBNAME_PAT   = $(LIBNAME_MAJ)
+   else
+-    LIBNAME_PAT	= $(LIBNAME_MIN)-$(BUILD_TYPE)$(BUILD_NUMBER)
++    LIBNAME_MAJ	= $(LIB_FILENAME).$(MAJOR_VERSION)
++    LIBNAME_MIN	= $(LIBNAME_MAJ).$(MINOR_VERSION)
++    ifeq ($(BUILD_TYPE),.)
++      LIBNAME_PAT	= $(LIBNAME_MIN).$(BUILD_NUMBER)
++    else
++      LIBNAME_PAT	= $(LIBNAME_MIN)-$(BUILD_TYPE)$(BUILD_NUMBER)
++    endif
+   endif
+ else
+   LIBNAME_MAJ	= $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(LIB_SUFFIX),$(LIB_FILENAME))
+@@ -212,8 +215,10 @@
+ 
+   $(LIBDIR)/$(LIB_FILENAME): $(LIBDIR)/$(LIBNAME_PAT)
+ 	cd $(LIBDIR) ; rm -f $(LIB_FILENAME) ; ln -sf $(LIBNAME_PAT) $(LIB_FILENAME)
++ifneq ($(OSTYPE),FreeBSD)
+ 	cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ;  ln -sf $(LIBNAME_PAT) $(LIBNAME_MAJ)
+ 	cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ;  ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN)
++endif
+ 
+   $(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_FILE)
+ 	@echo EXTLIBS = $(EXTLIBS)
+@@ -224,8 +229,10 @@
+   install: $(LIBDIR)/$(LIBNAME_PAT)
+ 	$(INSTALL) $(LIBDIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_PAT)
+ 	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_FILENAME)
++ifneq ($(OSTYPE),FreeBSD)
+ 	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ)
+ 	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN)
++endif
+ 
+ endif # P_SHAREDLIB
+ 
-- 
cgit v1.2.3