moreutils: Import moreutils-0.60 as wip/moreutils

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: moreutils: Import moreutils-0.60 as wip/moreutils
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Tue, 09 May 2017 07:15:31 +0000

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue May 9 09:15:31 2017 +0200
Changeset:	74308b2b7c98233803ed7c87ccbd282345e83701

Modified Files:
	Makefile
Added Files:
	moreutils/DESCR
	moreutils/Makefile
	moreutils/PLIST
	moreutils/distinfo
	moreutils/patches/patch-Makefile
	moreutils/patches/patch-ifdata.c

Log Message:
moreutils: Import moreutils-0.60 as wip/moreutils

moreutils is a growing collection of the unix tools that nobody
thought to write long ago when unix was young.

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

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

diffstat:
 Makefile                         |  1 +
 moreutils/DESCR                  |  2 ++
 moreutils/Makefile               | 45 ++++++++++++++++++++++++++++++++++++++++
 moreutils/PLIST                  | 31 +++++++++++++++++++++++++++
 moreutils/distinfo               |  8 +++++++
 moreutils/patches/patch-Makefile | 29 ++++++++++++++++++++++++++
 moreutils/patches/patch-ifdata.c | 15 ++++++++++++++
 7 files changed, 131 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index dd58df6f49..cf3408570d 100644
--- a/Makefile
+++ b/Makefile
@@ -1924,6 +1924,7 @@ SUBDIR+=	mono-zeroconf
 SUBDIR+=	mop
 SUBDIR+=	mopac7
 SUBDIR+=	moregroupware
+SUBDIR+=	moreutils
 SUBDIR+=	morse
 SUBDIR+=	mosquitto
 SUBDIR+=	moto4lin
diff --git a/moreutils/DESCR b/moreutils/DESCR
new file mode 100644
index 0000000000..1878e061c4
--- /dev/null
+++ b/moreutils/DESCR
@@ -0,0 +1,2 @@
+moreutils is a growing collection of the unix tools that nobody
+thought to write long ago when unix was young.
diff --git a/moreutils/Makefile b/moreutils/Makefile
new file mode 100644
index 0000000000..e1322beb26
--- /dev/null
+++ b/moreutils/Makefile
@@ -0,0 +1,45 @@
+# $NetBSD$
+
+DISTNAME=	moreutils_0.60.orig
+PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
+CATEGORIES=	misc
+MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/m/moreutils/}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	leot%NetBSD.org@localhost
+HOMEPAGE=	https://joeyh.name/code/moreutils/
+COMMENT=	Additional Unix utilities
+LICENSE=	gnu-gpl-v2
+
+USE_TOOLS+=	gmake pod2man perl:run
+
+BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+BUILD_DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2
+BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
+
+DEPENDS+=	p5-IPC-Run-[0-9]*:../../devel/p5-IPC-Run
+
+SUBST_CLASSES+=			pkgmandir
+SUBST_STAGE.pkgmandir=		pre-configure
+SUBST_FILES.pkgmandir=		Makefile
+SUBST_MESSAGE.pkgmandir=	Fixing man page installation.
+SUBST_SED.pkgmandir=		-e 's,share/man,${PKGMANDIR},'
+
+REPLACE_PERL+=	chronic
+REPLACE_PERL+=	combine
+REPLACE_PERL+=	ts
+REPLACE_PERL+=	vidir
+REPLACE_PERL+=	vipe
+REPLACE_PERL+=	zrun
+
+MAKE_ENV+=	\
+	PREFIX=${PREFIX} \
+	CFLAGS=${CFLAGS:Q} \
+	DOCBOOKXSL=${PREFIX}/share/xsl/docbook \
+	INSTALL_BIN=${INSTALL_PROGRAM:Q} \
+	INSTALL_MAN=${INSTALL_MAN:Q} \
+	INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
+
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/moreutils/PLIST b/moreutils/PLIST
new file mode 100644
index 0000000000..5f32335ca2
--- /dev/null
+++ b/moreutils/PLIST
@@ -0,0 +1,31 @@
+@comment $NetBSD$
+bin/chronic
+bin/combine
+bin/errno
+bin/ifdata
+bin/ifne
+bin/isutf8
+bin/lckdo
+bin/mispipe
+bin/parallel
+bin/pee
+bin/sponge
+bin/ts
+bin/vidir
+bin/vipe
+bin/zrun
+man/man1/chronic.1
+man/man1/combine.1
+man/man1/errno.1
+man/man1/ifdata.1
+man/man1/ifne.1
+man/man1/isutf8.1
+man/man1/lckdo.1
+man/man1/mispipe.1
+man/man1/parallel.1
+man/man1/pee.1
+man/man1/sponge.1
+man/man1/ts.1
+man/man1/vidir.1
+man/man1/vipe.1
+man/man1/zrun.1
diff --git a/moreutils/distinfo b/moreutils/distinfo
new file mode 100644
index 0000000000..5879278541
--- /dev/null
+++ b/moreutils/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+SHA1 (moreutils_0.60.orig.tar.xz) = 3af60490f763ece48b2fcba968903673c3e63495
+RMD160 (moreutils_0.60.orig.tar.xz) = aa3700e114f51513bf52123eae19d3f9625d7052
+SHA512 (moreutils_0.60.orig.tar.xz) = 3fb5d8e140a90d805c4cd0de74248a5ea830ba8f90c56afdeb537391c32984cbb9701d4d9caf187a5f9284dfe791d1f7a333af3aac2a4860e2041c414e5cb788
+Size (moreutils_0.60.orig.tar.xz) = 79360 bytes
+SHA1 (patch-Makefile) = d01222065c1e751a326248d70219f26952e0b42a
+SHA1 (patch-ifdata.c) = 5c0d9737657354ad1877f2efc6ff08e76ca7bc62
diff --git a/moreutils/patches/patch-Makefile b/moreutils/patches/patch-Makefile
new file mode 100644
index 0000000000..248d6eaced
--- /dev/null
+++ b/moreutils/patches/patch-Makefile
@@ -0,0 +1,29 @@
+$NetBSD$
+
+Instruct Makefile to properly handle also man pages and scripts via
+corresponding INSTALL_{MAN,SCRIPT} in a similar vein of INSTALL_BIN.
+
+--- Makefile.orig	2016-08-13 13:58:21.000000000 +0000
++++ Makefile
+@@ -3,6 +3,8 @@ PERLSCRIPTS=vidir vipe ts combine zrun c
+ MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 chronic.1 mispipe.1 lckdo.1 parallel.1 errno.1
+ CFLAGS?=-O2 -g -Wall
+ INSTALL_BIN?=install -s
++INSTALL_MAN?=install
++INSTALL_SCRIPT?=install
+ PREFIX?=/usr
+ 
+ ifneq (,$(findstring CYGWIN,$(shell uname)))
+@@ -25,10 +27,10 @@ isutf8: is_utf8/*.c is_utf8/*.h
+ install:
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	$(INSTALL_BIN) $(BINS) $(DESTDIR)$(PREFIX)/bin
+-	install $(PERLSCRIPTS) $(DESTDIR)$(PREFIX)/bin
++	$(INSTALL_SCRIPT) $(PERLSCRIPTS) $(DESTDIR)$(PREFIX)/bin
+ 
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
+-	install $(MANS) $(DESTDIR)$(PREFIX)/share/man/man1
++	$(INSTALL_MAN) $(MANS) $(DESTDIR)$(PREFIX)/share/man/man1
+ 
+ check: isutf8
+ 	./is_utf8/test.sh
diff --git a/moreutils/patches/patch-ifdata.c b/moreutils/patches/patch-ifdata.c
new file mode 100644
index 0000000000..bec8f8f887
--- /dev/null
+++ b/moreutils/patches/patch-ifdata.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add NetBSD support.
+
+--- ifdata.c.orig	2016-08-13 13:58:21.000000000 +0000
++++ ifdata.c
+@@ -18,7 +18,7 @@
+ 	#include <net/if.h>
+ #endif
+ 
+-#if defined(__APPLE__) || defined(__OpenBSD__)
++#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ 	#define s6_addr16 __u6_addr.__u6_addr16
+ 	#include <net/if.h>
+ #endif

Prev by Date: don't actually need the MAKE_ENV sed stuff since removing do-build
Next by Date: moreutils: cosmetic reorganization (following doc/Makefile-example practices)
Previous by Thread: don't actually need the MAKE_ENV sed stuff since removing do-build
Next by Thread: moreutils: cosmetic reorganization (following doc/Makefile-example practices)
Indexes:

Home | Main Index | Thread Index | Old Index