pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
moreutils: Delete, imported in pkgsrc as misc/moreutils
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Mon Sep 4 11:45:29 2017 +0200
Changeset: 41936db271277ab6521adc6033b55aef113cbb5e
Modified Files:
Makefile
Removed Files:
moreutils/DESCR
moreutils/Makefile
moreutils/PLIST
moreutils/distinfo
moreutils/patches/patch-Makefile
moreutils/patches/patch-ifdata.c
moreutils/patches/patch-is__utf8_Makefile
Log Message:
moreutils: Delete, imported in pkgsrc as misc/moreutils
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=41936db271277ab6521adc6033b55aef113cbb5e
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
moreutils/DESCR | 20 --------------
moreutils/Makefile | 45 -------------------------------
moreutils/PLIST | 31 ---------------------
moreutils/distinfo | 9 -------
moreutils/patches/patch-Makefile | 30 ---------------------
moreutils/patches/patch-ifdata.c | 15 -----------
moreutils/patches/patch-is__utf8_Makefile | 19 -------------
8 files changed, 170 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index d535fedc96..bf371dae7c 100644
--- a/Makefile
+++ b/Makefile
@@ -2014,7 +2014,6 @@ SUBDIR+= mono-zeroconf
SUBDIR+= mop
SUBDIR+= mopac7
SUBDIR+= moregroupware
-SUBDIR+= moreutils
SUBDIR+= morse
SUBDIR+= mosquitto
SUBDIR+= motion
diff --git a/moreutils/DESCR b/moreutils/DESCR
deleted file mode 100644
index 7b250a8bc1..0000000000
--- a/moreutils/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-moreutils is a growing collection of the unix tools that nobody
-thought to write long ago when unix was young.
-
-It consists of these tools:
-
- - chronic: runs a command quietly unless it fails
- - combine: combine the lines in two files using boolean operations
- - errno: look up errno names and descriptions
- - ifdata: get network interface info without parsing ifconfig output
- - isutf8: check if a file or standard input is utf-8
- - ifne: run a command if the standard input is not empty
- - lckdo: execute a program with a lock held (deprecated)
- - mispipe: pipe two commands, returning the exit status of the first
- - parallel: run multiple jobs at once
- - pee: tee standard input to pipes
- - sponge: soak up standard input and write to a file
- - ts: timestamp standard input
- - vidir: edit a directory in your text editor
- - vipe: insert a text editor into a pipe
- - zrun: automatically uncompress arguments to command
diff --git a/moreutils/Makefile b/moreutils/Makefile
deleted file mode 100644
index 41655f407e..0000000000
--- a/moreutils/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $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
-
-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
-
-USE_TOOLS+= gmake pod2man perl:run
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-
-REPLACE_PERL+= chronic
-REPLACE_PERL+= combine
-REPLACE_PERL+= ts
-REPLACE_PERL+= vidir
-REPLACE_PERL+= vipe
-REPLACE_PERL+= zrun
-
-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},'
-
-MAKE_ENV+= \
- PREFIX=${PREFIX} \
- CFLAGS=${CFLAGS:Q} \
- LDFLAGS=${LDFLAGS:Q} \
- DOCBOOKXSL=${PREFIX}/share/xsl/docbook \
- INSTALL_BIN=${INSTALL_PROGRAM:Q} \
- INSTALL_MAN=${INSTALL_MAN:Q} \
- INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/moreutils/PLIST b/moreutils/PLIST
deleted file mode 100644
index 5f32335ca2..0000000000
--- a/moreutils/PLIST
+++ /dev/null
@@ -1,31 +0,0 @@
-@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
deleted file mode 100644
index b3b8eb2ba8..0000000000
--- a/moreutils/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$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) = 757f0d98eaa43537dfaadcda87346562e3a2137c
-SHA1 (patch-ifdata.c) = 5c0d9737657354ad1877f2efc6ff08e76ca7bc62
-SHA1 (patch-is__utf8_Makefile) = 8feacdc8a0a0939aefd7f647be8196bdfdbda66c
diff --git a/moreutils/patches/patch-Makefile b/moreutils/patches/patch-Makefile
deleted file mode 100644
index f91fb82a97..0000000000
--- a/moreutils/patches/patch-Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-$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
-+ mkdir -p $(DESTDIR)$(PREFIX)/man/man1
-+ $(INSTALL_MAN) $(MANS) $(DESTDIR)$(PREFIX)/man/man1
-
- check: isutf8
- ./is_utf8/test.sh
diff --git a/moreutils/patches/patch-ifdata.c b/moreutils/patches/patch-ifdata.c
deleted file mode 100644
index bec8f8f887..0000000000
--- a/moreutils/patches/patch-ifdata.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
diff --git a/moreutils/patches/patch-is__utf8_Makefile b/moreutils/patches/patch-is__utf8_Makefile
deleted file mode 100644
index f2a2d5f7cc..0000000000
--- a/moreutils/patches/patch-is__utf8_Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Honor LDFLAGS for RELRO builds.
-
---- is_utf8/Makefile.orig 2016-08-13 13:58:21.000000000 +0000
-+++ is_utf8/Makefile
-@@ -41,10 +41,10 @@ CC = gcc
- CFLAGS = -O3 -Wextra -Wall -ansi -Wstrict-prototypes
-
- $(NAME): $(OBJ)
-- $(CC) $(CFLAGS) -o $(NAME) $(OBJ)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(NAME) $(OBJ)
-
- IS_UTF8_LIB:
-- $(CC) --shared -fPIC $(CFLAGS) $(LIB_SRC) -o $(LINKERNAME)
-+ $(CC) --shared -fPIC $(CFLAGS) $(LDFLAGS) $(LIB_SRC) -o $(LINKERNAME)
-
- all:
- @make $(NAME)
Home |
Main Index |
Thread Index |
Old Index