Date: Mon, 6 Jan 2014 02:38:03 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338837 - in head/sysutils/ftwin: . files Message-ID: <201401060238.s062c3QL004536@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Mon Jan 6 02:38:03 2014 New Revision: 338837 URL: http://svnweb.freebsd.org/changeset/ports/338837 Log: - Update from 0.8.5 to 0.8.8 - Add LICENSE PR: ports/185348 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Deleted: head/sysutils/ftwin/files/patch-ftwin.c Modified: head/sysutils/ftwin/Makefile head/sysutils/ftwin/distinfo (contents, props changed) head/sysutils/ftwin/files/patch-acinclude-check-cflags-ldflags (contents, props changed) Modified: head/sysutils/ftwin/Makefile ============================================================================== --- head/sysutils/ftwin/Makefile Mon Jan 6 01:17:01 2014 (r338836) +++ head/sysutils/ftwin/Makefile Mon Jan 6 02:38:03 2014 (r338837) @@ -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 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 <bsd.port.mk> Modified: head/sysutils/ftwin/distinfo ============================================================================== --- head/sysutils/ftwin/distinfo Mon Jan 6 01:17:01 2014 (r338836) +++ head/sysutils/ftwin/distinfo Mon Jan 6 02:38:03 2014 (r338837) @@ -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 Modified: head/sysutils/ftwin/files/patch-acinclude-check-cflags-ldflags ============================================================================== --- head/sysutils/ftwin/files/patch-acinclude-check-cflags-ldflags Mon Jan 6 01:17:01 2014 (r338836) +++ head/sysutils/ftwin/files/patch-acinclude-check-cflags-ldflags Mon Jan 6 02:38:03 2014 (r338837) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401060238.s062c3QL004536>