Attachment #111127 for bug #152347

View | Details | Raw Unified | Return to bug 152347
Collapse All | Expand All

Lines 7-13 Link Here

(-)./moreutils/Makefile (-3 / +7 lines)
7	#	7	#
8		8
9	PORTNAME= moreutils	9	PORTNAME= moreutils
10	PORTVERSION= 0.42	10	PORTVERSION= 0.43
11	CATEGORIES= sysutils	11	CATEGORIES= sysutils
12	MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}	12	MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
13	DISTNAME= ${PORTNAME}_${PORTVERSION}	13	DISTNAME= ${PORTNAME}_${PORTVERSION}
Lines 17-25 Link Here
17		17
18	CONFLICTS= parallel-[0-9]*	18	CONFLICTS= parallel-[0-9]*
19		19
		20	RUN_DEPENDS= ${SITE_PERL}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run
		21
20	USE_PERL5= yes	22	USE_PERL5= yes
21		23
22	PLIST_FILES= bin/combine \	24	PLIST_FILES= bin/chronic \
		25	bin/combine \
23	bin/ifne \	26	bin/ifne \
24	bin/isutf8 \	27	bin/isutf8 \
25	bin/lckdo \	28	bin/lckdo \
Lines 39-45 Link Here
39	.include <bsd.port.pre.mk>	42	.include <bsd.port.pre.mk>
40		43
41	.if !defined(NO_INSTALL_MANPAGES)	44	.if !defined(NO_INSTALL_MANPAGES)
42	MAN1= combine.1 \	45	MAN1= chronic.1 \
		46	combine.1 \
43	ifne.1 \	47	ifne.1 \
44	isutf8.1 \	48	isutf8.1 \
45	lckdo.1 \	49	lckdo.1 \

Lines 1-3 Link Here

(-)./moreutils/distinfo (-3 / +2 lines)
1	MD5 (moreutils_0.42.tar.gz) = 9bac64540b315e9008521a9fea19d9ab	1	SHA256 (moreutils_0.43.tar.gz) = 09e31e4f308bb1e8f9ab4f7d57f9e3c8246e3e3824015534af59763114a85c7d
2	SHA256 (moreutils_0.42.tar.gz) = 71cf9b37dd5093d51c4c7bbebca786bee54806b13b9c6be683f486fc0d5b614f	2	SIZE (moreutils_0.43.tar.gz) = 44233
3	SIZE (moreutils_0.42.tar.gz) = 43296




--- ./Makefile.orig	2010-10-29 12:47:09.000000000 -0700
+++ ./Makefile	2010-11-17 16:02:08.000000000 -0800
@@ -1,51 +1,35 @@
-BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel
+BINS=isutf8 ifne pee sponge mispipe lckdo parallel
 PERLSCRIPTS=vidir vipe ts combine zrun chronic
-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
-CFLAGS=-O2 -g -Wall
+MANS=sponge.1 isutf8.1 ifne.1 pee.1 mispipe.1 lckdo.1 parallel.1
+CFLAGS+= -Wall

-PREFIX=/usr
 
-DOCBOOK2XMAN=docbook2x-man
+
+.SUFFIXES: .1 .docbook
+
+DOCBOOK2XMAN= ${LOCALBASE}/bin/xsltproc ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl
 
 all: $(BINS) $(MANS)
+ 
+bins: ${BINS}
+
+mans: ${MANS}
 
 clean:
 	rm -f $(BINS) $(MANS)
 

Lines 1-6 Link Here

(-)./moreutils/files/patch-parallel.c (-5 / +5 lines)
1	--- parallel.c.orig 2010-02-09 12:39:08.000000000 -0800	1	--- ./parallel.c.orig 2010-07-06 12:06:47.000000000 -0700
2	+++ parallel.c 2010-02-09 22:27:25.000000000 -0800	2	+++ ./parallel.c 2010-11-17 15:49:57.000000000 -0800
3	@@ -76,6 +76,7 @@	3	@@ -87,6 +87,7 @@
4	return;	4	return;
5	}	5	}
6		6
Lines 8-15 Link Here
8	int wait_for_child(int options) {	8	int wait_for_child(int options) {
9	id_t id_ignored = 0;	9	id_t id_ignored = 0;
10	siginfo_t infop;	10	siginfo_t infop;
11	@@ -88,6 +89,18 @@	11	@@ -101,6 +102,18 @@
12	return infop.si_status;	12	}
13	return 1;	13	return 1;
14	}	14	}
15	+#else	15	+#else

Lines 15-21 Link Here

(-)./moreutils/pkg-descr (-1 / +2 lines)
15	- isutf8: check if a file or standard input is utf-8	15	- isutf8: check if a file or standard input is utf-8
16	- lckdo: execute a program with a lock held	16	- lckdo: execute a program with a lock held
17	- parallel: run multiple jobs at once	17	- parallel: run multiple jobs at once
		18	- chronic: run a command quietly, unless it fails
18		19
19	The 'ifdata' utility is not included in this FreeBSD port.	20	The Linux-specific 'ifdata' utility is not included in this FreeBSD port.
20		21
21	WWW: http://kitenet.net/~joey/code/moreutils/	22	WWW: http://kitenet.net/~joey/code/moreutils/

Return to bug 152347

Lines 1-10 Link Here

(-)./moreutils/files/patch-Makefile (-7 / +8 lines)
1	--- Makefile.orig 2009-07-02 12:00:44.000000000 -0700	1	--- ./Makefile.orig 2010-10-29 12:47:09.000000000 -0700
2	+++ Makefile 2010-02-09 22:13:14.000000000 -0800	2	+++ ./Makefile 2010-11-17 16:02:08.000000000 -0800
3	@@ -1,51 +1,34 @@	3	@@ -1,51 +1,35 @@
4	-BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel	4	-BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel
5	+BINS=isutf8 ifne pee sponge mispipe lckdo parallel	5	+BINS=isutf8 ifne pee sponge mispipe lckdo parallel
6	PERLSCRIPTS=vidir vipe ts combine zrun	6	PERLSCRIPTS=vidir vipe ts combine zrun chronic
7	-MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 mispipe.1 lckdo.1 parallel.1	7	-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
8	-CFLAGS=-O2 -g -Wall	8	-CFLAGS=-O2 -g -Wall
9	+MANS=sponge.1 isutf8.1 ifne.1 pee.1 mispipe.1 lckdo.1 parallel.1	9	+MANS=sponge.1 isutf8.1 ifne.1 pee.1 mispipe.1 lckdo.1 parallel.1
10	+CFLAGS+= -Wall	10	+CFLAGS+= -Wall
Lines 12-27 Link Here
12	-PREFIX=/usr	12	-PREFIX=/usr
13		13
14	-DOCBOOK2XMAN=docbook2x-man	14	-DOCBOOK2XMAN=docbook2x-man
		15	+
15	+.SUFFIXES: .1 .docbook	16	+.SUFFIXES: .1 .docbook
16	+	17	+
17	+DOCBOOK2XMAN= ${LOCALBASE}/bin/xsltproc ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl	18	+DOCBOOK2XMAN= ${LOCALBASE}/bin/xsltproc ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl
18		19
19	all: $(BINS) $(MANS)	20	all: $(BINS) $(MANS)
20		21	+
21	+bins: ${BINS}	22	+bins: ${BINS}
22	+	23	+
23	+mans: ${MANS}	24	+mans: ${MANS}
24	+	25
25	clean:	26	clean:
26	rm -f $(BINS) $(MANS)	27	rm -f $(BINS) $(MANS)
27		28