From 7961ea46f226fe1d46e4a0f0a92b49afb2e79115 Mon Sep 17 00:00:00 2001 From: danilo Date: Mon, 6 Jan 2014 02:38:03 +0000 Subject: - Update from 0.8.5 to 0.8.8 - Add LICENSE PR: ports/185348 Submitted by: KATO Tsuguru --- sysutils/ftwin/Makefile | 32 ++++++++++++++-------- sysutils/ftwin/distinfo | 4 +-- .../files/patch-acinclude-check-cflags-ldflags | 29 ++------------------ sysutils/ftwin/files/patch-ftwin.c | 11 -------- 4 files changed, 25 insertions(+), 51 deletions(-) delete mode 100644 sysutils/ftwin/files/patch-ftwin.c diff --git a/sysutils/ftwin/Makefile b/sysutils/ftwin/Makefile index 7e73c21..a1d985c 100644 --- a/sysutils/ftwin/Makefile +++ b/sysutils/ftwin/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ftwin -PORTVERSION= 0.8.5 -PORTREVISION= 11 +PORTVERSION= 0.8.8 CATEGORIES= sysutils MASTER_SITES= http://files.etoilebsd.net/ftwin/ \ http://download.meroware.org/ftwin/ @@ -10,24 +9,33 @@ MASTER_SITES= http://files.etoilebsd.net/ftwin/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Useful tool to find duplicate files -LIB_DEPENDS= libpuzzle.so:${PORTSDIR}/graphics/libpuzzle \ - libapr-1.so:${PORTSDIR}/devel/apr1 \ - libpcre.so:${PORTSDIR}/devel/pcre +LICENSE= APACHE20 + +LIB_DEPENDS= libapr-1.so:${PORTSDIR}/devel/apr1 \ + libpcre.so:${PORTSDIR}/devel/pcre \ + libpuzzle.so:${PORTSDIR}/graphics/libpuzzle OPTIONS_DEFINE= DOCS USE_BZIP2= yes -GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf aclocal automake autoheader +USE_AUTOTOOLS= aclocal autoheader automake autoconf AUTOMAKE_ARGS= --add-missing -CONFIGURE_ARGS+= --with-puzzle=${LOCALBASE} -PLIST_FILES= bin/ftwin \ - man/man8/ftwin.8.gz -PORTDOCS= AUTHORS EXAMPLES TODO CHANGES KNOWN_BUGS VERSION LICENSE README +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +PORTDOCS= AUTHORS EXAMPLES TODO CHANGES KNOWN_BUGS VERSION README +PLIST_FILES= bin/ftwin man/man8/ftwin.8.gz + +post-patch: + @${REINPLACE_CMD} -e \ + 's|-Werror -g -ggdb|| ; \ + s|-O0||' ${WRKSRC}/Makefile.am post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} +.for i in ${PORTDOCS} + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) +.endfor .include diff --git a/sysutils/ftwin/distinfo b/sysutils/ftwin/distinfo index f39cc01..0098475 100644 --- a/sysutils/ftwin/distinfo +++ b/sysutils/ftwin/distinfo @@ -1,2 +1,2 @@ -SHA256 (ftwin-0.8.5.tar.bz2) = 03dec36503b3c781f287b4427e99d9d1ccc704f1d9e11eadcd630e4c29dea0ce -SIZE (ftwin-0.8.5.tar.bz2) = 164234 +SHA256 (ftwin-0.8.8.tar.bz2) = 78ba3c70acc48cbe86a653a15d91ae8e194d6bfd4f9baefc9fd27fa697b2435e +SIZE (ftwin-0.8.8.tar.bz2) = 168461 diff --git a/sysutils/ftwin/files/patch-acinclude-check-cflags-ldflags b/sysutils/ftwin/files/patch-acinclude-check-cflags-ldflags index 8577144..b5721a5 100644 --- a/sysutils/ftwin/files/patch-acinclude-check-cflags-ldflags +++ b/sysutils/ftwin/files/patch-acinclude-check-cflags-ldflags @@ -1,5 +1,5 @@ ---- ./acinclude.m4.orig 2008-11-03 18:03:37.000000000 +0100 -+++ ./acinclude.m4 2009-06-08 11:04:57.456599653 +0200 +--- acinclude.m4.orig 2013-12-18 05:14:54.000000000 +0900 ++++ acinclude.m4 2013-12-18 05:16:15.000000000 +0900 @@ -141,8 +141,8 @@ ]) @@ -11,30 +11,7 @@ [ HAVE_CHECK=yes ], -@@ -173,9 +173,11 @@ - # Make sure we have "puzzle.h". If we don't, it means we probably - # don't have libpuzzle, so don't use it. - # -+ CPPFLAGS="$CPPFLAGS -I$puzzle/include" - AC_CHECK_HEADER(puzzle.h, - [ - # Check if the lib is OK -+ LDFLAGS="$LDFLAGS -L$puzzle/lib" - AC_CHECK_LIB(puzzle, puzzle_init_context, - [ - AC_DEFINE([HAVE_PUZZLE], 1, [for image comparison mode]) -@@ -216,16 +218,18 @@ - # Make sure we have "archive.h". If we don't, it means we probably - # don't have libarchive, so don't use it. - # -+ CPPFLAGS="$CPPFLAGS -I$archive/include" - AC_CHECK_HEADER(archive.h, - [ - # Check if the lib is OK -+ LDFLAGS="$LDFLAGS -L$archive/lib -lmd -lcrypto" - AC_CHECK_LIB(archive, archive_version, - [ - AC_DEFINE([HAVE_ARCHIVE], 1, [for inside archive comparison mode]) +@@ -225,7 +225,7 @@ with_archive=yes ARCHIVE_CPPFLAGS="-I$archive/include" ARCHIVE_LDFLAGS="-L$archive/lib" diff --git a/sysutils/ftwin/files/patch-ftwin.c b/sysutils/ftwin/files/patch-ftwin.c deleted file mode 100644 index b6bb330..0000000 --- a/sysutils/ftwin/files/patch-ftwin.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ftwin.c.orig 2009-05-21 14:32:32.000000000 +0200 -+++ src/ftwin.c 2013-09-05 08:21:38.056133246 +0200 -@@ -228,7 +228,7 @@ - apr_dir_t *dir; - apr_int32_t statmask = - APR_FINFO_SIZE | APR_FINFO_TYPE | APR_FINFO_USER | APR_FINFO_GROUP | APR_FINFO_UPROT | APR_FINFO_GPROT; -- apr_size_t fname_len; -+ apr_size_t fname_len = 0; - apr_uint32_t hash_value; - apr_status_t status; - int rc; -- cgit v1.1