Attachment 143716 Details for Bug 190903 – sysutils_dar.diff

[patch] sysutils_dar.diff

sysutils_dar.diff (text/plain), 3.21 KB, created by tkato432 on 2014-06-12 18:00:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-06-12 18:00:06 UTC

Size: 3.21 KB

patch

obsolete

>diff -urN /usr/ports/sysutils/dar/Makefile sysutils/dar/Makefile
>--- /usr/ports/sysutils/dar/Makefile	2014-06-12 04:16:42.000000000 +0900
>+++ sysutils/dar/Makefile	2014-06-13 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/sysutils/dar/Makefile 357486 2014-06-11 14:49:59Z tijl $
> 
> PORTNAME=	dar
>-PORTVERSION=	2.4.12
>-PORTREVISION=	1
>+PORTVERSION=	2.4.13
> CATEGORIES=	sysutils archivers
> MASTER_SITES=	SF
> 
>@@ -12,19 +11,19 @@
> 
> LICENSE=	GPLv2 # (or later)
> 
>-USES=		pathfix shebangfix libtool
>+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-gnugetopt --disable-dar-static
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
> OPTIONS_DEFINE=		DOCS LZO NLS
> OPTIONS_SUB=		yes
>@@ -43,7 +42,8 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>-		'/LIBS/s|-lpthread|-pthread|' ${WRKSRC}/configure
>+		's|(char \*\*) $\&inptr,$|\1| ; \
>+		 /LIBS/s|-lpthread|-pthread|' ${WRKSRC}/configure
> 	@${FIND} ${WRKSRC}/doc -name "Makefile.in" | ${XARGS} \
> 		${REINPLACE_CMD} -e \
> 		's|$$(pkgdatadir)|$$(docdir)|g'
>diff -urN /usr/ports/sysutils/dar/distinfo sysutils/dar/distinfo
>--- /usr/ports/sysutils/dar/distinfo	2014-02-28 02:52:53.000000000 +0900
>+++ sysutils/dar/distinfo	2014-06-13 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (dar-2.4.12.tar.gz) = 6bc4bec5692f970d58a649905afeabc0b4a8e10c9604cd6d16e7205ef343cf55
>-SIZE (dar-2.4.12.tar.gz) = 1799320
>+SHA256 (dar-2.4.13.tar.gz) = f3b2c3c7ad615b76683f8cdb6d025576f4373c75b9e37a9f340536054350c97a
>+SIZE (dar-2.4.13.tar.gz) = 1799774
>diff -urN /usr/ports/sysutils/dar/files/patch-configure sysutils/dar/files/patch-configure
>--- /usr/ports/sysutils/dar/files/patch-configure	2014-06-12 04:16:43.000000000 +0900
>+++ sysutils/dar/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
>@@ -1,20 +0,0 @@
>---- 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;
>diff -urN /usr/ports/sysutils/dar/pkg-plist sysutils/dar/pkg-plist
>--- /usr/ports/sysutils/dar/pkg-plist	2014-05-28 02:35:22.000000000 +0900
>+++ sysutils/dar/pkg-plist	2014-06-13 00:00:00.000000000 +0900
>@@ -64,7 +64,7 @@
> lib/libdar.a
> lib/libdar.so
> lib/libdar.so.5000
>-lib/libdar.so.5000.5.0
>+lib/libdar.so.5000.6.0
> libdata/pkgconfig/libdar.pc
> man/man1/dar.1.gz
> man/man1/dar_cp.1.gz

Actions: View | Diff

Attachments on bug 190903: 143646 | 143716