graphics/copperspice: upgrade v1.2.2 => v1.3.2, release maintainership

I'm not longer evaluating copperspice for use in a project, so release
maintainship of it.  I upgraded to the latest version first though.

7 files changed, 153 insertions, 124 deletions

diff --git a/graphics/copperspice/Makefile b/graphics/copperspice/Makefile
index 40a6d5d0a9c..41cabf7dcd6 100644
--- a/graphics/copperspice/Makefile
+++ b/graphics/copperspice/Makefile
@@ -2,22 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	copperspice
-PORTVERSION=	1.2.2
+PORTVERSION=	1.3.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.copperspice.com/copperspice/source/
 
-MAINTAINER=	marino@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modern cross-platform C++ GUI library (derived from Qt 4.8)
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	fc-cache:x11-fonts/fontconfig
 LIB_DEPENDS=	libaudio.so:audio/nas \
-		libfreetype.so:print/freetype2
-
-USES=		compiler:c++11-lib gmake iconv libtool pkgconfig tar:bz2
-USE_XORG=	ice sm x11 xcursor xext xi xinerama xrandr
-USE_GNOME=	glib20
+		libdrm.so:graphics/libdrm \
+		libexpat.so:textproc/expat2 \
+		libffi.so:devel/libffi \
+		libfreetype.so:print/freetype2 \
+		libglapi.so:graphics/libglapi \
+		libgstbase-0.10.so:multimedia/gstreamer \
+		libgstreamer-0.10.so:multimedia/gstreamer \
+		libpcre.so:devel/pcre \
+		libfontconfig.so:x11-fonts/fontconfig
+
+USES=		compiler:c++11-lib gettext-runtime gmake iconv libtool \
+		pkgconfig tar:bz2
+USE_XORG=	ice sm x11 xau xcb xcursor xdamage xdmcp xext xfixes xi \
+		xinerama xrandr xrender xt xxf86vm
+USE_GNOME=	glib20 libxml2
 USE_GL=		gl
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
@@ -34,15 +43,17 @@ OVERRIDE_INS=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL="${INSTALL}"
 CONFIGURE_ARGS=	${OVERRIDE_INS}
 MAKE_ARGS=	${OVERRIDE_INS}
-PLIST_SUB=	SHORT_VER=0 LONG_VER=0.0.0
-
-WITH_OPENSSL_PORT=	yes
+PLIST_SUB=	LONG_VER=1.3
 
 BROKEN_FreeBSD_9=	PR 193528 (c++11 support is broken)
 BROKEN_i386=		qx11embed_x11.cpp:470:20: non-constant-expression\
 			cannot be narrowed from type 'unsigned int' to 'long'\
 			in initializer list [-Wc++11-narrowing]
 
+post-patch:
+	# fix something wrong with v1.3.2 generatior
+	${REINPLACE_CMD} -e '/config.status:/ s/:.*/:/' ${WRKSRC}/Makefile.in
+
 post-configure:
 	${REINPLACE_CMD} -e '/^hardcode_libdir_flag/ \
 		s|spec=.*|spec="-Wl,-rpath,${LOCALBASE}/lib"|' \
diff --git a/graphics/copperspice/distinfo b/graphics/copperspice/distinfo
index 4a5eb914807..66b77907a71 100644
--- a/graphics/copperspice/distinfo
+++ b/graphics/copperspice/distinfo
@@ -1,2 +1,3 @@
-SHA256 (copperspice-1.2.2.tar.bz2) = fbcda16ef133a86014875c85f7a829b1049026b1b754eaf6cd262dc6806e20fe
-SIZE (copperspice-1.2.2.tar.bz2) = 15225245
+TIMESTAMP = 1473866630
+SHA256 (copperspice-1.3.2.tar.bz2) = 64dc3819b2beec102c21ac9656e3f910d2ff89fda6f20d1472d17c8efea3cba2
+SIZE (copperspice-1.3.2.tar.bz2) = 15311791
diff --git a/graphics/copperspice/files/patch-Makefile.in b/graphics/copperspice/files/patch-Makefile.in
new file mode 100644
index 00000000000..97d73d85912
--- /dev/null
+++ b/graphics/copperspice/files/patch-Makefile.in
@@ -0,0 +1,47 @@
+--- Makefile.in.orig	2016-09-12 14:20:12 UTC
++++ Makefile.in
+@@ -1253,7 +1253,7 @@ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-lib_libCsCore@BUILD_ABI@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++lib_libCsCore@BUILD_ABI@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(lib_libCsCore@BUILD_ABI@_la_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(lib_libCsCore@BUILD_ABI@_la_LDFLAGS) $(LDFLAGS) -o $@
+@@ -2326,7 +2326,7 @@ nodist_lib_libCsGui@BUILD_ABI@_la_OBJECT
+ lib_libCsGui@BUILD_ABI@_la_OBJECTS =  \
+ 	$(am_lib_libCsGui@BUILD_ABI@_la_OBJECTS) \
+ 	$(nodist_lib_libCsGui@BUILD_ABI@_la_OBJECTS)
+-lib_libCsGui@BUILD_ABI@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++lib_libCsGui@BUILD_ABI@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(lib_libCsGui@BUILD_ABI@_la_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(lib_libCsGui@BUILD_ABI@_la_LDFLAGS) $(LDFLAGS) -o $@
+@@ -2610,7 +2610,7 @@ am_lib_libCsOpenGL@BUILD_ABI@_la_OBJECTS
+ 	$(am__objects_79) $(am__objects_80) $(am__objects_81)
+ lib_libCsOpenGL@BUILD_ABI@_la_OBJECTS =  \
+ 	$(am_lib_libCsOpenGL@BUILD_ABI@_la_OBJECTS)
+-lib_libCsOpenGL@BUILD_ABI@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++lib_libCsOpenGL@BUILD_ABI@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(lib_libCsOpenGL@BUILD_ABI@_la_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(lib_libCsOpenGL@BUILD_ABI@_la_LDFLAGS) $(LDFLAGS) -o $@
+@@ -3412,7 +3412,7 @@ am__lib_phonon_qt7_la_SOURCES_DIST =  \
+ @OSTYPE_DARWIN_TRUE@	src/3rdparty/phonon/qt7/lib_phonon_qt7_la-videowidget.lo
+ lib_phonon_qt7_la_OBJECTS = $(am_lib_phonon_qt7_la_OBJECTS)
+ lib_phonon_qt7_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+-	$(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
++	--tag=CXX $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(lib_phonon_qt7_la_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(lib_phonon_qt7_la_LDFLAGS) $(LDFLAGS) -o $@
+ @OSTYPE_DARWIN_TRUE@am_lib_phonon_qt7_la_rpath = -rpath $(libdir)
+@@ -3604,7 +3604,7 @@ am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAU
+ am__v_OBJCXX_0 = @echo "  OBJCXX  " $@;
+ am__v_OBJCXX_1 = 
+ OBJCXXLD = $(OBJCXX)
+-OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
diff --git a/graphics/copperspice/files/patch-configure b/graphics/copperspice/files/patch-configure
deleted file mode 100644
index a77ba67349a..00000000000
--- a/graphics/copperspice/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2016-03-12 21:43:12 UTC
-+++ configure
-@@ -9002,7 +9002,7 @@ esac
- LIBTOOL_DEPS=$ltmain
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool --tag=CC'
- 
- 
- 
-@@ -17104,7 +17104,7 @@ case "$target" in
- 	OSTYPE=LINUX ;;
- *-*-darwin*)
- 	OSTYPE=DARWIN ;;
--*-*-*bsd*)
-+*-*-*bsd*|*-*-dragonfly*)
- 	OSTYPE=BSD ;;
- esac
- 
diff --git a/graphics/copperspice/files/patch-df-support b/graphics/copperspice/files/patch-df-support
deleted file mode 100644
index b65c43787f4..00000000000
--- a/graphics/copperspice/files/patch-df-support
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -405,7 +405,7 @@
- #endif
- 
- /* OS(FREEBSD) - FreeBSD */
--#ifdef __FreeBSD__
-+#if defined (__FreeBSD__) || defined (__DragonFly__)
- #define WTF_OS_FREEBSD 1
- #endif
- 
---- src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp
-+++ src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp
-@@ -3781,6 +3781,8 @@ QString QWebPage::userAgentForUrl(const QUrl&) const
- 
- #elif defined Q_OS_BSD4
-         firstPartTemp += QString::fromLatin1("BSD Four");
-+#elif defined Q_OS_DRAGONFLY
-+        firstPartTemp += QString::fromLatin1("DragonFly");
- #elif defined Q_OS_FREEBSD
-         firstPartTemp += QString::fromLatin1("FreeBSD");
- #elif defined Q_OS_HPUX
---- src/core/global/qglobal.h
-+++ src/core/global/qglobal.h
-@@ -178,6 +178,10 @@ QT_USE_NAMESPACE
- #elif defined(__linux__) || defined(__linux)
- #  define Q_OS_LINUX
- 
-+#elif defined(__DragonFly__)
-+#  define Q_OS_DRAGONFLY
-+#  define Q_OS_BSD4
-+
- #elif defined(__FreeBSD__)
- #  define Q_OS_FREEBSD
- #  define Q_OS_BSD4
-@@ -1665,7 +1669,7 @@ Q_CORE_EXPORT int qrand();
- 
- 
- #if defined (__ELF__)
--#  if defined (Q_OS_LINUX) || defined (Q_OS_SOLARIS) || defined (Q_OS_FREEBSD) || defined (Q_OS_OPENBSD)
-+#  if defined (Q_OS_LINUX) || defined (Q_OS_SOLARIS) || defined (Q_OS_FREEBSD) || defined (Q_OS_OPENBSD) || defined (Q_OS_DRAGONFLY)
- #    define Q_OF_ELF
- #  endif
- #endif
---- src/core/global/qplatformdefs.h
-+++ src/core/global/qplatformdefs.h
-@@ -280,7 +280,7 @@ typedef enum {
- 
- 
- // ***********
--#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_DRAGONFLY)
- 
- #include <qplatformposix.h>
- 
diff --git a/graphics/copperspice/files/patch-src_webkit_Makefile.in b/graphics/copperspice/files/patch-src_webkit_Makefile.in
new file mode 100644
index 00000000000..bc47a37a8a1
--- /dev/null
+++ b/graphics/copperspice/files/patch-src_webkit_Makefile.in
@@ -0,0 +1,65 @@
+--- src/webkit/Makefile.in.orig	2016-09-12 14:20:12 UTC
++++ src/webkit/Makefile.in
+@@ -259,7 +259,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+ ______lib_libCsWebKit@BUILD_ABI@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
++	$(AM_LIBTOOLFLAGS) --tag=CXX $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(______lib_libCsWebKit@BUILD_ABI@_la_OBJCXXFLAGS) \
+ 	$(OBJCXXFLAGS) $(______lib_libCsWebKit@BUILD_ABI@_la_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+@@ -721,7 +721,7 @@ am_______lib_webkit_libwebkitA_la_OBJECT
+ ______lib_webkit_libwebkitA_la_OBJECTS =  \
+ 	$(am_______lib_webkit_libwebkitA_la_OBJECTS)
+ ______lib_webkit_libwebkitA_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_LIBTOOLFLAGS) --tag=CXX $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+ 	$(______lib_webkit_libwebkitA_la_CXXFLAGS) $(CXXFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ @WEBKIT_TRUE@am_______lib_webkit_libwebkitA_la_rpath =
+@@ -1400,7 +1400,7 @@ am_______lib_webkit_libwebkitB_la_OBJECT
+ ______lib_webkit_libwebkitB_la_OBJECTS =  \
+ 	$(am_______lib_webkit_libwebkitB_la_OBJECTS)
+ ______lib_webkit_libwebkitB_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_LIBTOOLFLAGS) --tag=CXX $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+ 	$(______lib_webkit_libwebkitB_la_CXXFLAGS) $(CXXFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ @WEBKIT_TRUE@am_______lib_webkit_libwebkitB_la_rpath =
+@@ -1956,7 +1956,7 @@ am_______lib_webkit_libwebkitC_la_OBJECT
+ ______lib_webkit_libwebkitC_la_OBJECTS =  \
+ 	$(am_______lib_webkit_libwebkitC_la_OBJECTS)
+ ______lib_webkit_libwebkitC_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_LIBTOOLFLAGS) --tag=CXX $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+ 	$(______lib_webkit_libwebkitC_la_CXXFLAGS) $(CXXFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ @WEBKIT_TRUE@am_______lib_webkit_libwebkitC_la_rpath =
+@@ -2376,7 +2376,7 @@ am_______lib_webkit_libwebkitD_la_OBJECT
+ ______lib_webkit_libwebkitD_la_OBJECTS =  \
+ 	$(am_______lib_webkit_libwebkitD_la_OBJECTS)
+ ______lib_webkit_libwebkitD_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_LIBTOOLFLAGS) --tag=CXX $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+ 	$(______lib_webkit_libwebkitD_la_CXXFLAGS) $(CXXFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ @WEBKIT_TRUE@am_______lib_webkit_libwebkitD_la_rpath =
+@@ -2386,7 +2386,7 @@ am_______lib_webkit_libwebkitE_la_OBJECT
+ ______lib_webkit_libwebkitE_la_OBJECTS =  \
+ 	$(am_______lib_webkit_libwebkitE_la_OBJECTS)
+ ______lib_webkit_libwebkitE_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++	$(AM_LIBTOOLFLAGS) --tag=CXX $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+ 	$(______lib_webkit_libwebkitE_la_CXXFLAGS) $(CXXFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ @WEBKIT_TRUE@am_______lib_webkit_libwebkitE_la_rpath =
+@@ -2453,7 +2453,7 @@ am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAU
+ am__v_OBJCXX_0 = @echo "  OBJCXX  " $@;
+ am__v_OBJCXX_1 = 
+ OBJCXXLD = $(OBJCXX)
+-OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) --tag=CXX $(LIBTOOLFLAGS) \
+ 	--mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
diff --git a/graphics/copperspice/pkg-plist b/graphics/copperspice/pkg-plist
index 505a73f009e..b88a4b49bc7 100644
--- a/graphics/copperspice/pkg-plist
+++ b/graphics/copperspice/pkg-plist
@@ -287,6 +287,10 @@ include/QtCore/QtNamespace
 include/QtCore/QtPlugin
 include/QtCore/QtPluginInstanceFunction
 include/QtCore/cs_build_info.h
+include/QtCore/cs_internal.h
+include/QtCore/cs_macro.h
+include/QtCore/cs_signal.h
+include/QtCore/cs_slot.h
 include/QtCore/csmeta.h
 include/QtCore/csmeta_callevent.h
 include/QtCore/csmeta_internal_1.h
@@ -2093,40 +2097,16 @@ include/phonon/videowidgetinterfacelatest.h
 include/phonon/volumefadereffect.h
 include/phonon/volumefaderinterface.h
 include/phonon/volumeslider.h
-lib/libCsCore1.so
-lib/libCsCore1.so.%%LONG_VER%%
-lib/libCsCore1.so.%%SHORT_VER%%
-lib/libCsGui1.so
-lib/libCsGui1.so.%%LONG_VER%%
-lib/libCsGui1.so.%%SHORT_VER%%
-lib/libCsMultimedia1.so
-lib/libCsMultimedia1.so.%%LONG_VER%%
-lib/libCsMultimedia1.so.%%SHORT_VER%%
-lib/libCsNetwork1.so
-lib/libCsNetwork1.so.%%LONG_VER%%
-lib/libCsNetwork1.so.%%SHORT_VER%%
-lib/libCsOpenGL1.so
-lib/libCsOpenGL1.so.%%LONG_VER%%
-lib/libCsOpenGL1.so.%%SHORT_VER%%
-lib/libCsPhonon1.so
-lib/libCsPhonon1.so.%%LONG_VER%%
-lib/libCsPhonon1.so.%%SHORT_VER%%
-lib/libCsScript1.so
-lib/libCsScript1.so.%%LONG_VER%%
-lib/libCsScript1.so.%%SHORT_VER%%
-lib/libCsSql1.so
-lib/libCsSql1.so.%%LONG_VER%%
-lib/libCsSql1.so.%%SHORT_VER%%
-lib/libCsSvg1.so
-lib/libCsSvg1.so.%%LONG_VER%%
-lib/libCsSvg1.so.%%SHORT_VER%%
-lib/libCsWebKit1.so
-lib/libCsWebKit1.so.%%LONG_VER%%
-lib/libCsWebKit1.so.%%SHORT_VER%%
-lib/libCsXml1.so
-lib/libCsXml1.so.%%LONG_VER%%
-lib/libCsXml1.so.%%SHORT_VER%%
-lib/libCsXmlPatterns1.so
-lib/libCsXmlPatterns1.so.%%LONG_VER%%
-lib/libCsXmlPatterns1.so.%%SHORT_VER%%
+lib/libCsCore%%LONG_VER%%.so
+lib/libCsGui%%LONG_VER%%.so
+lib/libCsMultimedia%%LONG_VER%%.so
+lib/libCsNetwork%%LONG_VER%%.so
+lib/libCsOpenGL%%LONG_VER%%.so
+lib/libCsPhonon%%LONG_VER%%.so
+lib/libCsScript%%LONG_VER%%.so
+lib/libCsSql%%LONG_VER%%.so
+lib/libCsSvg%%LONG_VER%%.so
+lib/libCsWebKit%%LONG_VER%%.so
+lib/libCsXml%%LONG_VER%%.so
+lib/libCsXmlPatterns%%LONG_VER%%.so
 lib/phonon_gstreamer.so