upgrade to 1.21

PR:		46587
Submitted by:	Ports Fury

5 files changed, 73 insertions, 5 deletions

diff --git a/devel/xparam/files/patch-Makefile.in b/devel/xparam/files/patch-Makefile.in
new file mode 100644
index 000000000000..b23aa94a9e06
--- /dev/null
+++ b/devel/xparam/files/patch-Makefile.in
@@ -0,0 +1,22 @@
+--- Makefile.in.orig	Sat Nov 16 01:29:46 2002
++++ Makefile.in	Sat Dec 21 14:09:19 2002
+@@ -52,17 +52,11 @@
+ prepare_check :
+ 	-$(MAKE) -C tests prepare
+ 
+-ifeq (x$(DESTDIR),x)
+-install_command = (@LDCONFIG@ $(libdir) || true) >/dev/null 2>&1
+-else
+-install_command = echo @LDCONFIG@ not run. You may need to execute \"@LDCONFIG@ $(libdir)\" after installation in $(libdir).
+-endif
+-
+-install : $(LIBNAME) installinfo
++install : $(LIBNAME)
+ 	$(INSTALL) -d $(DESTDIR)$(libdir)
+ 	$(INSTALL) -d $(DESTDIR)$(includedir)
+ 	$(INSTALL) -d $(DESTDIR)$(priv_includedir)
+-	libtool $(INSTALL_PROGRAM) $(LIBNAME) $(DESTDIR)$(libdir)
++	libtool --mode=install $(INSTALL_PROGRAM) $(LIBNAME) $(DESTDIR)$(libdir)
+ 	$(INSTALL_DATA) $(XPARAM_PUBLIC_INCLUDE_FILES) $(DESTDIR)$(includedir)
+ 	$(INSTALL_DATA) $(XPARAM_INCLUDE_FILES) $(DESTDIR)$(priv_includedir)
+ 	$(install_command)
diff --git a/devel/xparam/files/patch-examples::calculator::Makefile.in b/devel/xparam/files/patch-examples::calculator::Makefile.in
new file mode 100644
index 000000000000..c9ce136e45fe
--- /dev/null
+++ b/devel/xparam/files/patch-examples::calculator::Makefile.in
@@ -0,0 +1,15 @@
+--- examples/calculator/Makefile.in.orig	Sat Oct 26 09:45:35 2002
++++ examples/calculator/Makefile.in	Sat Dec 21 14:10:40 2002
+@@ -17,10 +17,10 @@
+ 	$(CXX) -c -o $@ $<
+ 
+ sobj/mathfunc.so : $(SLOBJECTS)
+-	libtool $(CXX) -shared $^ -lxparam -o $@
++	libtool --mode=link $(CXX) -shared $^ -lxparam -o $@
+ 
+ $(SLOBJECTS) : obj/%.lo : src/%.cpp include/mathfunc.h include/functions.h
+-	libtool $(CXX) -c -o $@ $<
++	libtool --mode=compile $(CXX) -c -o $@ $<
+ 
+ clean :
+ 	-rm -f $(TARGETS) $(OBJECTS) $(SOBJECTS) $(SLOBJECTS)
diff --git a/devel/xparam/files/patch-examples::involved::Makefile.in b/devel/xparam/files/patch-examples::involved::Makefile.in
new file mode 100644
index 000000000000..91adf7e6ebaf
--- /dev/null
+++ b/devel/xparam/files/patch-examples::involved::Makefile.in
@@ -0,0 +1,15 @@
+--- examples/involved/Makefile.in.orig	Sat Oct 26 09:45:35 2002
++++ examples/involved/Makefile.in	Sat Dec 21 14:11:44 2002
+@@ -20,10 +20,10 @@
+ 	$(CXX) -c -o $@ $<
+ 
+ sobj/circle.so : $(SLOBJECTS)
+-	libtool $(CXX) -shared $^ -lxparam -o $@
++	libtool --mode=link $(CXX) -shared $^ -lxparam -o $@
+ 
+ $(SLOBJECTS) : obj/%.lo : src/%.cpp include/circle.h include/shapes.h
+-	libtool $(CXX) -c -o $@ $<
++	libtool --mode=compile $(CXX) -c -o $@ $<
+ 
+ clean :
+ 	-rm -f $(TARGETS) $(OBJECTS) $(SOBJECTS) $(SLOBJECTS)
diff --git a/devel/xparam/files/patch-lib::Makefile.in b/devel/xparam/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..96e953675a6d
--- /dev/null
+++ b/devel/xparam/files/patch-lib::Makefile.in
@@ -0,0 +1,19 @@
+--- lib/Makefile.in.orig	Sat Oct 26 09:45:35 2002
++++ lib/Makefile.in	Sat Dec 21 14:06:47 2002
+@@ -36,13 +36,13 @@
+ 	-rm -rf $(XPARAM_OBJ_PATH)/.libs $(ANTLR_OBJ_PATH)/.libs
+ 
+ $(XPARAM_LOBJ_FILES) : $(XPARAM_OBJ_PATH)/%.lo : $(XPARAM_SRC_PATH)/%.cpp Makefile
+-	libtool @CXX@ @CXXFLAGS@ @CPPFLAGS@ -I$(ANTLR_INCLUDE_PATH) -c -o $@ $<
++	libtool --mode=compile @CXX@ @CXXFLAGS@ @CPPFLAGS@ -I$(ANTLR_INCLUDE_PATH) -c -o $@ $<
+ 
+ $(ANTLR_LOBJ_FILES) : $(ANTLR_OBJ_PATH)/%.lo : $(ANTLR_SRC_PATH)/%.cpp
+-	libtool @CXX@ @CXXFLAGS@ @CPPFLAGS@ -I$(ANTLR_INCLUDE_PATH) -c -o $@ $<
++	libtool --mode=compile @CXX@ @CXXFLAGS@ @CPPFLAGS@ -I$(ANTLR_INCLUDE_PATH) -c -o $@ $<
+ 
+ $(LIBRARY) : $(ALL_LOBJ_FILES)
+-	libtool @CXX@ @LDFLAGS@ -o $(LIBRARY) $(ALL_LOBJ_FILES) @LIBS@ -rpath $(libdir) -version-info 1:0:0
++	libtool --mode=link @CXX@ @LDFLAGS@ -o $(LIBRARY) $(ALL_LOBJ_FILES) @LIBS@ -rpath $(libdir) -version-info 1:0:0
+ 
+ .PHONY : all clean
+ 
diff --git a/devel/xparam/files/patch-lib_sources_xpv__dynamic__loader.cpp b/devel/xparam/files/patch-lib::sources::xpv_dynamic_loader.cpp
index 537cd2f10be0..2c1ba9aee6b1 100644
--- a/devel/xparam/files/patch-lib_sources_xpv__dynamic__loader.cpp
+++ b/devel/xparam/files/patch-lib::sources::xpv_dynamic_loader.cpp
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- lib/sources/xpv_dynamic_loader.cpp.orig	Sun Dec 22 17:50:59 2002
-+++ lib/sources/xpv_dynamic_loader.cpp	Sun Dec 22 17:51:18 2002
+--- lib/sources/xpv_dynamic_loader.cpp.orig	Sun Nov 25 03:43:26 2001
++++ lib/sources/xpv_dynamic_loader.cpp	Sat Dec 28 10:59:43 2002
 @@ -209,7 +209,7 @@
  	loader.load(type_name);
  }