Attachment 196992 Details for Bug 229773 – Proprosed Update/Changes

[patch] Proprosed Update/Changes

dupd.patch (text/plain), 5.40 KB, created by Nathan on 2018-09-09 22:11:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan

Created: 2018-09-09 22:11:37 UTC

Size: 5.40 KB

patch

obsolete

> sysutils/dupd:
> 
>* Update to 1.7
>* Rearange variables
> -- To match correct ordering
>* Add DOCS to options
>* Strip binary
> 
>Changelog: https://github.com/jvirkki/dupd/blob/1.7/ChangeLog
>
>Index: sysutils/dupd/Makefile
>===================================================================
>--- sysutils/dupd/Makefile	(revision 479322)
>+++ sysutils/dupd/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	dupd
>-PORTVERSION=	1.6
>+PORTVERSION=	1.7
> CATEGORIES=	sysutils
> 
> MAINTAINER=	tom@hur.st
>@@ -11,24 +11,30 @@
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-NOT_FOR_ARCHS=	arm armv6 armv7 i386 mips powerpc
>-NOT_FOR_ARCHS_REASON=	test fails on large files on 32-bit
>+TEST_DEPENDS+=	bash:shells/bash
> 
>-USES=	gmake perl5 ssl sqlite:3
>+USES=		gmake localbase perl5 sqlite:3 ssl
> USE_PERL5=	test
> 
>-TEST_DEPENDS+=	bash:shells/bash
>+ALL_TARGET=	dupd
>+TEST_TARGET=	test
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	jvirkki
> 
>-ALL_TARGET=	dupd
>-TEST_TARGET=	test
>+OPTIONS_DEFINE=	DOCS OPTIMIZED_CFLAGS
> 
>-PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
>+OPTIMIZED_CFLAGS_MAKE_ARGS=	CFLAGS="${CFLAGS:S/O2/O3/g}"
> 
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
>+# This gets rid of extra optimization caused by opt?
>+post-extract:
>+	${REINPLACE_CMD} -e '/OPT?=/d' ${WRKSRC}/Makefile
> 
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
>+
>+do-install-DOCS-on:
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	(cd ${WRKSRC}/docs ; ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR})
>+
> .include <bsd.port.mk>
>Index: sysutils/dupd/distinfo
>===================================================================
>--- sysutils/dupd/distinfo	(revision 479322)
>+++ sysutils/dupd/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1523215351
>-SHA256 (jvirkki-dupd-1.6_GH0.tar.gz) = 68bce4d5ac0b8a00ac50da65634950eb46fb11a571e546fb543fc6c6bf6b79da
>-SIZE (jvirkki-dupd-1.6_GH0.tar.gz) = 973621
>+TIMESTAMP = 1536527596
>+SHA256 (jvirkki-dupd-1.7_GH0.tar.gz) = 547eb62931ca524e9966db0bb84cdc806c6a7fa8cbdcf9ac52b043df88ca222d
>+SIZE (jvirkki-dupd-1.7_GH0.tar.gz) = 983762
>Index: sysutils/dupd/files/patch-Makefile
>===================================================================
>--- sysutils/dupd/files/patch-Makefile	(revision 479322)
>+++ sysutils/dupd/files/patch-Makefile	(nonexistent)
>@@ -1,39 +0,0 @@
>---- Makefile.orig	2018-03-21 18:56:42 UTC
>-+++ Makefile
>-@@ -21,7 +21,7 @@ TOP:=$(shell  pwd)
>- BUILD_OS:=$(shell uname)
>- BUILD_MACHINE:=$(shell uname -m)
>- VERSION:=$(shell cat version)
>--GITHASH:=$(shell git rev-parse HEAD)
>-+GITHASH:=
>- OPTGEN:=$(shell which optgen | head -c1)
>- 
>- ifeq ($(LCOV_OUTPUT_DIR),)
>-@@ -66,14 +66,12 @@ USAGE=$(BUILD)/usage.o
>- USAGE_ARCH=-O elf64-x86-64 -B i386
>- endif
>- 
>--ifeq ($(BUILD_OS),FreeBSD)
>--INC+=-I/usr/local/include
>--LIB+=-L/usr/local/lib
>-+INC+=-I${PREFIX}/include
>-+LIB+=-L${PREFIX}/lib
>- OBJCP=objcopy
>--CFLAGS=-m64 -DDIRENT_HAS_TYPE
>--USAGE=$(BUILD)/usage.o
>-+CFLAGS+=-DDIRENT_HAS_TYPE -D_FILE_OFFSET_BITS=64
>-+USAGE=
>- USAGE_ARCH=-O elf64-x86-64 -B i386
>--endif
>- 
>- ifeq ($(BUILD_OS),SunOS)
>- CC=gcc
>-@@ -92,7 +90,7 @@ endif
>- ifeq ($(DEBUG),1)
>- OPT=-g $(DEBUGOPT)
>- else
>--OPT=-O3
>-+#OPT=-O3
>- endif
>- 
>- 
>
>Property changes on: sysutils/dupd/files/patch-Makefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/dupd/files/patch-src_main.c
>===================================================================
>--- sysutils/dupd/files/patch-src_main.c	(revision 479322)
>+++ sysutils/dupd/files/patch-src_main.c	(nonexistent)
>@@ -1,23 +0,0 @@
>---- src/main.c.orig	2018-04-08 20:02:52 UTC
>-+++ src/main.c
>-@@ -141,19 +141,8 @@ static void show_help()
>-  */
>- static void show_usage()
>- {
>-+  system("/usr/bin/man dupd");
>-   show_banner();
>--
>--#ifndef __APPLE__
>--  char * p = &_binary_man_dupd_start;
>--  while (p != &_binary_man_dupd_end) {
>--    putchar(*p++);
>--  }
>--#else
>--  printf("Usage documentation not available on Darwin!\n");
>--  printf("\n");
>--  printf("Alternatively, refer to the document here:\n");
>--  printf("https://github.com/jvirkki/dupd\n");
>--#endif
>- }
>- 
>- 
>
>Property changes on: sysutils/dupd/files/patch-src_main.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/dupd/pkg-plist
>===================================================================
>--- sysutils/dupd/pkg-plist	(nonexistent)
>+++ sysutils/dupd/pkg-plist	(working copy)
>@@ -0,0 +1,7 @@
>+bin/dupd
>+man/man1/dupd.1.gz
>+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
>+%%PORTDOCS%%%%DOCSDIR%%/design.md
>+%%PORTDOCS%%%%DOCSDIR%%/examples.md
>+%%PORTDOCS%%%%DOCSDIR%%/index.md
>+%%PORTDOCS%%%%DOCSDIR%%/performance.md
>
>Property changes on: sysutils/dupd/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

tom: maintainer-approval+

Actions: View | Diff

Attachments on bug 229773: 195833 | 196992