Attachment #143716 for bug #190903




# $FreeBSD: head/sysutils/dar/Makefile 357486 2014-06-11 14:49:59Z tijl $

PORTNAME=	dar
PORTVERSION=	2.4.13
PORTREVISION=	1
CATEGORIES=	sysutils archivers
MASTER_SITES=	SF



LICENSE=	GPLv2 # (or later)

USES=		libtool pathfix shebangfix
SHEBANG_FILES=	doc/samples/dar_backup doc/samples/*.bash doc/samples/*.sh
USE_GCC=	any
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--datadir=${DATADIR} --disable-build-html \
		--disable-upx --disable-libgcrypt-linking \
		--disable-ea-support --disable-nodump-flag \
		--disable-gnugetopt --disable-dar-static
INSTALL_TARGET=	install-strip
USE_LDCONFIG=	yes

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

OPTIONS_DEFINE=		DOCS LZO NLS
OPTIONS_SUB=		yes


post-patch:
	@${REINPLACE_CMD} -e \
		's|(char \*\*) \(\&inptr,\)|\1| ; \
		 /LIBS/s|-lpthread|-pthread|' ${WRKSRC}/configure
	@${FIND} ${WRKSRC}/doc -name "Makefile.in" | ${XARGS} \
		${REINPLACE_CMD} -e \
		's|$$(pkgdatadir)|$$(docdir)|g'

Lines 1-2 Link Here

(-)sysutils/dar/distinfo (-2 / +2 lines)
1	SHA256 (dar-2.4.12.tar.gz) = 6bc4bec5692f970d58a649905afeabc0b4a8e10c9604cd6d16e7205ef343cf55	1	SHA256 (dar-2.4.13.tar.gz) = f3b2c3c7ad615b76683f8cdb6d025576f4373c75b9e37a9f340536054350c97a
2	SIZE (dar-2.4.12.tar.gz) = 1799320	2	SIZE (dar-2.4.13.tar.gz) = 1799774




--- configure.orig
+++ configure
@@ -6453,7 +6453,7 @@
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_utf8_to_88591,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
           return 1;
@@ -6472,7 +6472,7 @@
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_ascii_to_88591,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
           return 1;

Lines 64-70 Link Here

(-)sysutils/dar/pkg-plist (-1 / +1 lines)
64	lib/libdar.a	64	lib/libdar.a
65	lib/libdar.so	65	lib/libdar.so
66	lib/libdar.so.5000	66	lib/libdar.so.5000
67	lib/libdar.so.5000.5.0	67	lib/libdar.so.5000.6.0
68	libdata/pkgconfig/libdar.pc	68	libdata/pkgconfig/libdar.pc
69	man/man1/dar.1.gz	69	man/man1/dar.1.gz
70	man/man1/dar_cp.1.gz	70	man/man1/dar_cp.1.gz

Return to bug 190903

Lines 2-9 Link Here

(-)sysutils/dar/Makefile (-6 / +6 lines)
2	# $FreeBSD: head/sysutils/dar/Makefile 357486 2014-06-11 14:49:59Z tijl $	2	# $FreeBSD: head/sysutils/dar/Makefile 357486 2014-06-11 14:49:59Z tijl $
3		3
4	PORTNAME= dar	4	PORTNAME= dar
5	PORTVERSION= 2.4.12	5	PORTVERSION= 2.4.13
6	PORTREVISION= 1
7	CATEGORIES= sysutils archivers	6	CATEGORIES= sysutils archivers
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8
Lines 12-30 Link Here
12		11
13	LICENSE= GPLv2 # (or later)	12	LICENSE= GPLv2 # (or later)
14		13
15	USES= pathfix shebangfix libtool	14	USES= libtool pathfix shebangfix
16	SHEBANG_FILES= doc/samples/dar_backup doc/samples/.bash doc/samples/.sh	15	SHEBANG_FILES= doc/samples/dar_backup doc/samples/.bash doc/samples/.sh
17	USE_GCC= any	16	USE_GCC= any
18	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
19	CONFIGURE_ARGS= --datadir=${DATADIR} --disable-build-html \	18	CONFIGURE_ARGS= --datadir=${DATADIR} --disable-build-html \
20	--disable-upx --disable-libgcrypt-linking \	19	--disable-upx --disable-libgcrypt-linking \
21	--disable-ea-support --disable-nodump-flag \	20	--disable-ea-support --disable-nodump-flag \
22	--disable-gnugetopt	21	--disable-gnugetopt --disable-dar-static
23	INSTALL_TARGET= install-strip	22	INSTALL_TARGET= install-strip
24	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
25		24
26	CPPFLAGS+= -I${LOCALBASE}/include	25	CPPFLAGS+= -I${LOCALBASE}/include
27	LIBS+= -L${LOCALBASE}/lib	26	LDFLAGS+= -L${LOCALBASE}/lib
28		27
29	OPTIONS_DEFINE= DOCS LZO NLS	28	OPTIONS_DEFINE= DOCS LZO NLS
30	OPTIONS_SUB= yes	29	OPTIONS_SUB= yes
Lines 43-49 Link Here
43		42
44	post-patch:	43	post-patch:
45	@${REINPLACE_CMD} -e \	44	@${REINPLACE_CMD} -e \
46	'/LIBS/s\|-lpthread\|-pthread\|' ${WRKSRC}/configure	45	's\|(char \\) \(\&inptr,\)\|\1\| ; \
		46	/LIBS/s\|-lpthread\|-pthread\|' ${WRKSRC}/configure
47	@${FIND} ${WRKSRC}/doc -name "Makefile.in" \| ${XARGS} \	47	@${FIND} ${WRKSRC}/doc -name "Makefile.in" \| ${XARGS} \
48	${REINPLACE_CMD} -e \	48	${REINPLACE_CMD} -e \
49	's\|$$(pkgdatadir)\|$$(docdir)\|g'	49	's\|$$(pkgdatadir)\|$$(docdir)\|g'

Lines 1-20 Link Here

(-)sysutils/dar/files/patch-configure (-20 lines)
1	--- configure.orig
2	+++ configure
3	@@ -6453,7 +6453,7 @@
4	char *outptr = buf;
5	size_t outbytesleft = sizeof (buf);
6	size_t res = iconv (cd_utf8_to_88591,
7	- (char **) &inptr, &inbytesleft,
8	+ &inptr, &inbytesleft,
9	&outptr, &outbytesleft);
10	if (res == 0)
11	return 1;
12	@@ -6472,7 +6472,7 @@
13	char *outptr = buf;
14	size_t outbytesleft = sizeof (buf);
15	size_t res = iconv (cd_ascii_to_88591,
16	- (char **) &inptr, &inbytesleft,
17	+ &inptr, &inbytesleft,
18	&outptr, &outbytesleft);
19	if (res == 0)
20	return 1;