wjelement: Fix PLIST(dylib/so) and fix fetch from GitHub

[Travis Paul <Tr%visPaul.me@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Travis Paul <Tr%visPaul.me@localhost>
Pushed By:	tpaul
Date:		Thu Nov 3 00:15:10 2016 -0400
Changeset:	25a5f20b5dbbaf0b65d013271fcf3b382d5856d1

Modified Files:
	wjelement/Makefile
	wjelement/PLIST
	wjelement/TODO
	wjelement/distinfo
Removed Files:
	wjelement/patches/patch-src_wjelement_CMakeLists.txt

Log Message:
wjelement: Fix PLIST(dylib/so) and fix fetch from GitHub

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=25a5f20b5dbbaf0b65d013271fcf3b382d5856d1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wjelement/Makefile                                 | 16 +++++++++++----
 wjelement/PLIST                                    | 24 +++++++++++-----------
 wjelement/TODO                                     |  2 --
 wjelement/distinfo                                 |  8 ++++----
 .../patches/patch-src_wjelement_CMakeLists.txt     | 22 --------------------
 5 files changed, 28 insertions(+), 44 deletions(-)

diffs:
diff --git a/wjelement/Makefile b/wjelement/Makefile
index 96ef764..306f161 100644
--- a/wjelement/Makefile
+++ b/wjelement/Makefile
@@ -1,12 +1,13 @@
 # $NetBSD$
 # vim: noexpandtab:
 
+DISTNAME=	wjelement-v1.1
+PKGREVISION=	1
 GITHUB_PROJECT=	wjelement
-DISTNAME=	v1.1
-PKGNAME=	${GITHUB_PROJECT}-1.1.0
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GITHUB:=netmail-open/}
+GITHUB_TAG=	v1.1
 DIST_SUBDIR=	${GITHUB_PROJECT}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=netmail-open/}
+CATEGORIES=	devel
 
 MAINTAINER=	Tr%visPaul.me@localhost
 HOMEPAGE=	https://github.com/netmail-open/wjelement/
@@ -16,4 +17,11 @@ LICENSE=	gnu-lgpl-v2
 WRKSRC=		${WRKDIR}/wjelement-1.1
 USE_CMAKE=	yes
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+PLIST_SUBST+=	EXT=dylib
+.else
+PLIST_SUBST+=	EXT=so
+.endif
+
 .include	"../../mk/bsd.pkg.mk"
diff --git a/wjelement/PLIST b/wjelement/PLIST
index 33283dc..ece8c08 100644
--- a/wjelement/PLIST
+++ b/wjelement/PLIST
@@ -7,18 +7,18 @@ include/wjelement.h
 include/wjreader.h
 include/wjwriter.h
 include/xpl.h
-lib/libwjelement.so
-lib/libwjelement.so.1
-lib/libwjelement.so.1.0.0
-lib/libwjreader.so
-lib/libwjreader.so.1
-lib/libwjreader.so.1.0.0
-lib/libwjwriter.so
-lib/libwjwriter.so.1
-lib/libwjwriter.so.1.0.0
-lib/libxpl.so
-lib/libxpl.so.1
-lib/libxpl.so.1.0.0
+lib/libwjelement.${EXT}
+lib/libwjelement.1.${EXT}
+lib/libwjelement.1.0.0.${EXT}
+lib/libwjreader.${EXT}
+lib/libwjreader.1.${EXT}
+lib/libwjreader.1.0.0.${EXT}
+lib/libwjwriter.${EXT}
+lib/libwjwriter.1.${EXT}
+lib/libwjwriter.1.0.0.${EXT}
+lib/libxpl.${EXT}
+lib/libxpl.1.${EXT}
+lib/libxpl.1.0.0.${EXT}
 lib/pkgconfig/wjelement.pc
 share/doc/wjelement/index.html
 share/doc/wjelement/wjelement.html
diff --git a/wjelement/TODO b/wjelement/TODO
index 19a8ac7..fce4893 100644
--- a/wjelement/TODO
+++ b/wjelement/TODO
@@ -1,5 +1,3 @@
-Don't install doc to /doc,  see CMakeList.txt:62
-
 Is this warning OK?
 
   MACOSX_RPATH is not specified for the following targets:
diff --git a/wjelement/distinfo b/wjelement/distinfo
index 773de0c..c0dcb4b 100644
--- a/wjelement/distinfo
+++ b/wjelement/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (wjelement/v1.1.tar.gz) = f83c836e69079320160278c01feb706b7dd283c4
-RMD160 (wjelement/v1.1.tar.gz) = 084f96f2c9afdada5ca459c4203b0c093390a50e
-Size (wjelement/v1.1.tar.gz) = 80362 bytes
+SHA1 (wjelement/wjelement-v1.1.tar.gz) = f83c836e69079320160278c01feb706b7dd283c4
+RMD160 (wjelement/wjelement-v1.1.tar.gz) = 084f96f2c9afdada5ca459c4203b0c093390a50e
+SHA512 (wjelement/wjelement-v1.1.tar.gz) = b9c0214c0136e1cf188d0c6967c14f97632cb176f2d889019bc4932424d95bb6372e69951bada57fc8fe0b6c7997c74244d1e631a9ce2ad5833ddc1dcc462e74
+Size (wjelement/wjelement-v1.1.tar.gz) = 80362 bytes
 SHA1 (patch-CMakeLists.txt) = 8f61ca825e771ac383ffaf8a5dc69a136cd0598f
-SHA1 (patch-src_wjelement_CMakeLists.txt) = 9a8cf17fd14ca1d95f3ed832447224b52deda402
diff --git a/wjelement/patches/patch-src_wjelement_CMakeLists.txt b/wjelement/patches/patch-src_wjelement_CMakeLists.txt
deleted file mode 100644
index 0a9996e..0000000
--- a/wjelement/patches/patch-src_wjelement_CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Prevent undefined symbol errors when linking wjelement shared object
-
---- src/wjelement/CMakeLists.txt.orig	2015-06-03 22:52:12.000000000 +0000
-+++ src/wjelement/CMakeLists.txt
-@@ -11,6 +11,8 @@ target_link_libraries(wjelement
- 	wjreader
- 	wjwriter
- 	xpl
-+    socket
-+    nsl
- 	${ALL_LIBS}
- )
- 
-@@ -59,4 +61,4 @@ add_test(WJElement:PutMultipleValues	${E
- add_test(WJElement:Append				${EXECUTABLE_OUTPUT_PATH}/wjeunit append		)
- add_test(WJElement:Conditions			${EXECUTABLE_OUTPUT_PATH}/wjeunit conditions	)
- add_test(WJElement:Optionals			${EXECUTABLE_OUTPUT_PATH}/wjeunit optionals		)
--add_test(WJElement:Defaults				${EXECUTABLE_OUTPUT_PATH}/wjeunit defaults		)
-\ No newline at end of file
-+add_test(WJElement:Defaults				${EXECUTABLE_OUTPUT_PATH}/wjeunit defaults		)