pkgsrc-WIP-changes archive

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

ninka: Update wip/ninka to Git master (1.3.2) as of today



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <rillig%NetBSD.org@localhost>
Pushed By:	rillig
Date:		Sat Jan 6 21:57:39 2018 +0000
Changeset:	2c4526f66a3058857488d959fd8e7bafe9e7a7c3

Modified Files:
	ninka/Makefile
Removed Files:
	ninka/PLIST
	ninka/TODO
	ninka/distinfo

Log Message:
ninka: Update wip/ninka to Git master (1.3.2) as of today

Changes:
* Fixed CVE-2017-7239
* Several small changes

pkgsrc changes:
* Converted to a Perl module
* Checkout from Git revision since there is no official release yet

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

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

diffstat:
 ninka/Makefile | 55 +++++++++++++++++++++++++++----------------------------
 ninka/PLIST    |  7 -------
 ninka/TODO     |  2 --
 ninka/distinfo |  6 ------
 4 files changed, 27 insertions(+), 43 deletions(-)

diffs:
diff --git a/ninka/Makefile b/ninka/Makefile
index 13fdbb24e9..361a2f2676 100644
--- a/ninka/Makefile
+++ b/ninka/Makefile
@@ -1,44 +1,43 @@
 # $NetBSD: Makefile,v 1.4 2013/03/04 21:58:38 thomasklausner Exp $
 #
 
-DISTNAME=	ninka-1.3
+DISTNAME=	ninka-1.3.2pre20180106
 CATEGORIES=	devel
-MASTER_SITES=	http://ninka.turingmachine.org/download/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	kamel.derouiche%gmail.com@localhost
 HOMEPAGE=	http://ninka.turingmachine.org/
 COMMENT=	License identification tool for Source Code
-LICENSE=	gnu-agpl-v3
+LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	p5-Getopt-Long>=2.38:../../devel/p5-Getopt-Long
+GIT_REPOSITORIES=	ninka
+GIT_REPO.ninka=		https://github.com/dmgerman/ninka
+GIT_REVISION.ninka=	81f185261c8863c5b84344ee31192870be939faf
+PKGREVISION=		0
 
-USE_TOOLS+=	pax perl
-NO_BUILD=	yes
+DEPENDS+=	p5-Getopt-Long>=2.38:../../devel/p5-Getopt-Long
+DEPENDS+=	p5-DBI-[0-9]*:../../databases/p5-DBI
+DEPENDS+=	p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite
+DEPENDS+=	p5-File-Temp-[0-9]*:../../devel/p5-File-Temp
+DEPENDS+=	p5-Spreadsheet-WriteExcel-[0-9]*:../../math/p5-Spreadsheet-WriteExcel
+DEPENDS+=	p5-IO-CaptureOutput-[0-9]*:../../devel/p5-IO-CaptureOutput
+#BUILD_DEPENDS+=	p5-Test-Strict-[0-9]*:../../devel/p5-Test-Strict
+
+NO_CHECKSUM=	yes
+USE_TOOLS+=	pax perl:run
 USE_LANGUAGES=	# none
+WRKSRC=		${WRKDIR}/ninka
+PERL5_PACKLIST=	auto/Ninka/.packlist
 
-REPLACE_PERL+=	ninka.pl splitter/splitter.pl 											\
-					extComments/hashComments.pl extComments/extComments.pl \
-					senttok/senttok.pl matcher/matcher.pl filter/filter.pl
+# See https://github.com/dmgerman/ninka/pull/41
+SUBST_CLASSES+=		regex
+SUBST_STAGE.regex=	post-patch
+SUBST_FILES.regex=	lib/Ninka/SentenceExtractor.pm
+SUBST_SED.regex=	-e 's,1-2,1\,2,'
 
-INSTALLATION_DIRS=	bin
+REPLACE_PERL+=	*/*.pl
 
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	pre-configure
-SUBST_SED.paths+=	-e 's,extComments/extComments.pl,extComments.pl,g'
-SUBST_SED.paths+=	-e 's,splitter/splitter.pl,splitter.pl,g'
-SUBST_SED.paths+=	-e 's,filter/filter.pl,filter.pl,g'
-SUBST_SED.paths+=	-e 's,senttok/senttok.pl,senttok.pl,g'
-SUBST_SED.paths+=	-e 's,matcher/matcher.pl,matcher.pl,g'
-SUBST_FILES.paths+=	ninka.pl
-SUBST_MESSAGE.paths=	Fixing header search paths.
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/ninka.pl ${DESTDIR}${PREFIX}/bin/ninka.pl
-	${INSTALL_SCRIPT} ${WRKSRC}/extComments/extComments.pl ${DESTDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/splitter/splitter.pl ${DESTDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/filter/filter.pl ${DESTDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/senttok/senttok.pl ${DESTDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/matcher/matcher.pl ${DESTDIR}${PREFIX}/bin
+INSTALLATION_DIRS=	bin
 
+.include "../../wip/mk/git-package.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ninka/PLIST b/ninka/PLIST
deleted file mode 100644
index d5b9433c82..0000000000
--- a/ninka/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2012/09/03 23:07:42 jihbed Exp $
-bin/extComments.pl
-bin/filter.pl
-bin/matcher.pl
-bin/ninka.pl
-bin/senttok.pl
-bin/splitter.pl
diff --git a/ninka/TODO b/ninka/TODO
deleted file mode 100644
index bba02a39a9..0000000000
--- a/ninka/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-Possible security vulnerabilites to address:
- - CVE-2017-7239
diff --git a/ninka/distinfo b/ninka/distinfo
deleted file mode 100644
index c371c65284..0000000000
--- a/ninka/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1 2012/09/03 23:07:42 jihbed Exp $
-
-SHA1 (ninka-1.3.tar.bz2) = e414e0cda73ca2e6722c45ccc30b4335a4f19657
-RMD160 (ninka-1.3.tar.bz2) = 84925c82173d54e036b76a6639d018055a033b5c
-SHA512 (ninka-1.3.tar.bz2) = 4a6004de516be0c0e56af46b607bc71d92317670e57432e54f22b96161c161a0e827208596ac84873564692f4705117420986d91cfb71da4ff86a2345d8851fe
-Size (ninka-1.3.tar.bz2) = 81062 bytes


Home | Main Index | Thread Index | Old Index