pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wjelement: Fix portability issues with PLIST and Makefile



Module Name:	pkgsrc-wip
Committed By:	Travis Paul <Tr%visPaul.me@localhost>
Pushed By:	tpaul
Date:		Thu Nov 3 19:39:28 2016 -0400
Changeset:	a3a7fd2f66ac4d9823042c45777ab75fc22fb3bd

Modified Files:
	wjelement/Makefile
	wjelement/PLIST

Log Message:
wjelement: Fix portability issues with PLIST and Makefile

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

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

diffstat:
 wjelement/Makefile | 22 +++++++++++++++-------
 wjelement/PLIST    | 24 ++++++++++++------------
 2 files changed, 27 insertions(+), 19 deletions(-)

diffs:
diff --git a/wjelement/Makefile b/wjelement/Makefile
index 306f161..bc22094 100644
--- a/wjelement/Makefile
+++ b/wjelement/Makefile
@@ -2,26 +2,34 @@
 # vim: noexpandtab:
 
 DISTNAME=	wjelement-v1.1
-PKGREVISION=	1
-GITHUB_PROJECT=	wjelement
-GITHUB_TAG=	v1.1
-DIST_SUBDIR=	${GITHUB_PROJECT}
-MASTER_SITES=	${MASTER_SITE_GITHUB:=netmail-open/}
+PKGREVISION=	2
 CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=netmail-open/}
+DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	Tr%visPaul.me@localhost
 HOMEPAGE=	https://github.com/netmail-open/wjelement/
 COMMENT=	Flexible JSON manipulation and schema validataion in C
 LICENSE=	gnu-lgpl-v2
 
+GITHUB_PROJECT=	wjelement
+GITHUB_TAG=	v1.1
+MASTER_SITES=	${MASTER_SITE_GITHUB:=netmail-open/}
+
 WRKSRC=		${WRKDIR}/wjelement-1.1
 USE_CMAKE=	yes
 
+CHECK_PORTABILITY_SKIP=	src/cli/wje
+REPLACE_SH=	src/cli/wje
+
 .include "../../mk/bsd.prefs.mk"
+
 .if ${OPSYS} == "Darwin"
-PLIST_SUBST+=	EXT=dylib
+PLIST_SUBST+=	DYLIB=.dylib
+PLIST_SUBST+=	SO=
 .else
-PLIST_SUBST+=	EXT=so
+PLIST_SUBST+=	SO=.so
+PLIST_SUBST+=	DYLIB=
 .endif
 
 .include	"../../mk/bsd.pkg.mk"
diff --git a/wjelement/PLIST b/wjelement/PLIST
index ece8c08..88ff2a4 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.${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/libwjelement${SO}${DYLIB}
+lib/libwjelement${SO}.1${DYLIB}
+lib/libwjelement${SO}.1.0.0${DYLIB}
+lib/libwjreader${SO}${DYLIB}
+lib/libwjreader${SO}.1${DYLIB}
+lib/libwjreader${SO}.1.0.0${DYLIB}
+lib/libwjwriter${SO}${DYLIB}
+lib/libwjwriter${SO}.1${DYLIB}
+lib/libwjwriter${SO}.1.0.0${DYLIB}
+lib/libxpl${SO}${DYLIB}
+lib/libxpl${SO}.1${DYLIB}
+lib/libxpl${SO}.1.0.0${DYLIB}
 lib/pkgconfig/wjelement.pc
 share/doc/wjelement/index.html
 share/doc/wjelement/wjelement.html


Home | Main Index | Thread Index | Old Index