cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to moreutils-0.57, from Michael Reed, small tweak by me.

Browse Source
This commit is contained in:
sthen 2016-01-05 22:04:02 +00:00
parent 8ed222a237
commit e77b708d9a
3 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sysutils/moreutils/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.11 2015/06/08 09:02:49 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2016/01/05 22:04:02 sthen Exp $
COMMENT = miscellaneous unix tools
DISTNAME = moreutils_0.56
PKGNAME = ${DISTNAME:S/_/-/}
T = 7be6572532be02c03653f33dbf87c03b01e2bb26
DISTFILES= ${DISTNAME}{$T}.tar.gz
WRKDIST = ${WRKDIR}/moreutils
V = 0.57
DISTNAME = moreutils_$V
EXTRACT_SUFX = .orig.tar.gz
PKGNAME = moreutils-$V
WRKDIST = ${WRKDIR}/${PKGNAME}
CATEGORIES = sysutils
@ -19,8 +19,7 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c
#MASTER_SITES = ${MASTER_SITE_DEBIAN:=main/m/moreutils/}
MASTER_SITES = http://repo.or.cz/w/moreutils.git/snapshot/
MASTER_SITES = ${MASTER_SITE_DEBIAN:=main/m/moreutils/}
BUILD_DEPENDS = textproc/docbook-xsl
RUN_DEPENDS = devel/p5-IPC-Run \
@ -32,7 +31,6 @@ USE_GMAKE = Yes
NO_TEST = Yes
pre-patch:
mv ${WRKDIR}/moreutils-* ${WRKDIST}
perl -pi -e 's,/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages,${LOCALBASE}/share/xsl/docbook/manpages,' ${WRKSRC}/Makefile
sed -i 's,/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages,${LOCALBASE}/share/xsl/docbook/manpages,' ${WRKSRC}/Makefile
.include <bsd.port.mk>

4
sysutils/moreutils/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (moreutils_0.56.tar.gz) = oBJTqqL+lq6XKOjeVgKoskV+wEdnIbp8Oa8zWiu4FtY=
SIZE (moreutils_0.56.tar.gz) = 46986
SHA256 (moreutils_0.57.orig.tar.gz) = On1UsGNOXtqMPENJDUfOoYkVZwCJLepth2hnzvm8DR0=
SIZE (moreutils_0.57.orig.tar.gz) = 46749

36
sysutils/moreutils/patches/patch-ifdata_c
View File

@ -1,13 +1,7 @@
$OpenBSD: patch-ifdata_c,v 1.3 2015/06/08 09:02:49 sthen Exp $
--- ifdata.c.orig Wed Jun 3 17:04:42 2015
+++ ifdata.c Mon Jun 8 09:59:45 2015
@@ -1,4 +1,4 @@
-#include <error.h>
+#include <err.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/socket.h>
@@ -19,7 +19,7 @@
$OpenBSD: patch-ifdata_c,v 1.4 2016/01/05 22:04:02 sthen Exp $
--- ifdata.c.orig Mon Jul 13 18:29:11 2015
+++ ifdata.c Tue Jan 5 15:33:51 2016
@@ -18,7 +18,7 @@
#include <net/if.h>
#endif
@ -16,15 +10,6 @@ $OpenBSD: patch-ifdata_c,v 1.3 2015/06/08 09:02:49 sthen Exp $
#define s6_addr16 __u6_addr.__u6_addr16
#include <net/if.h>
#endif
@@ -130,7 +130,7 @@ static int do_socket_ioctl(const char *ifname, const u
*ioctl_errno = errno;
if (print_error == PRINT_ERROR) {
if (errno == ENODEV)
- error(EXIT_FAILURE, 0,
+ errx(EXIT_FAILURE,
"No such network interface: %s", ifname);
else
fprintf(stderr, "ioctl on %s: %s\n", ifname,
@@ -242,7 +242,7 @@ struct sockaddr *if_network(const char *iface) {
return saddr;
}
@ -34,16 +19,7 @@ $OpenBSD: patch-ifdata_c,v 1.3 2015/06/08 09:02:49 sthen Exp $
static struct ifreq req;
if (do_socket_ioctl(iface, SIOCGIFMTU, &req, NULL, PRINT_ERROR))
@@ -392,7 +392,7 @@ void please_do(int ndo, int *todo, const char *ifname)
for (i=0; i<ndo; i++) {
if (!exists &&
(todo[i] != DO_EXISTS) && (todo[i] != DO_PEXISTS))
- error(EXIT_FAILURE, 0, "No such network interface: %s",
+ errx(EXIT_FAILURE, "No such network interface: %s",
ifname);
switch (todo[i]) {
@@ -419,7 +419,7 @@ void please_do(int ndo, int *todo, const char *ifname)
@@ -420,7 +420,7 @@ void please_do(int ndo, int *todo, const char *ifname)
print_addr(if_bcast(ifname, &req));
break;
case DO_PMTU:
@ -52,7 +28,7 @@ $OpenBSD: patch-ifdata_c,v 1.3 2015/06/08 09:02:49 sthen Exp $
break;
case DO_PNETWORK:
print_addr(if_network(ifname));
@@ -431,7 +431,7 @@ void please_do(int ndo, int *todo, const char *ifname)
@@ -432,7 +432,7 @@ void please_do(int ndo, int *todo, const char *ifname)
printf(" ");
print_addr(if_bcast(ifname, &req));
printf(" ");