From owner-svn-ports-head@FreeBSD.ORG Sun Oct 7 20:43:22 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0EE73106564A; Sun, 7 Oct 2012 20:43:22 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E333B8FC08; Sun, 7 Oct 2012 20:43:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q97KhLUF067667; Sun, 7 Oct 2012 20:43:21 GMT (envelope-from jhale@svn.freebsd.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q97KhLpS067663; Sun, 7 Oct 2012 20:43:21 GMT (envelope-from jhale@svn.freebsd.org) Message-Id: <201210072043.q97KhLpS067663@svn.freebsd.org> From: "Jason E. Hale" Date: Sun, 7 Oct 2012 20:43:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305507 - in head/security/binwalk: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Oct 2012 20:43:22 -0000 Author: jhale Date: Sun Oct 7 20:43:21 2012 New Revision: 305507 URL: http://svn.freebsd.org/changeset/ports/305507 Log: - Update to 0.4.5 [1] - Drop specific ABI version numbers from LIB_DEPENDS [2] - Trim Makefile header [2] - Convert to new options framework [2] - Fix build on 7.x [2] PR: ports/172395 Submitted by: Kurt Jaeger (maintainer) [1] Approved by: makc (mentor), maintainer [2] Added: head/security/binwalk/files/ head/security/binwalk/files/patch-binwalk.c (contents, props changed) Modified: head/security/binwalk/Makefile (contents, props changed) head/security/binwalk/distinfo (contents, props changed) Modified: head/security/binwalk/Makefile ============================================================================== --- head/security/binwalk/Makefile Sun Oct 7 20:35:26 2012 (r305506) +++ head/security/binwalk/Makefile Sun Oct 7 20:43:21 2012 (r305507) @@ -1,11 +1,7 @@ -# New ports collection makefile for: binwalk -# Date created: 6 February 2012 -# Whom: Kurt Jaeger -# # $FreeBSD$ PORTNAME= binwalk -PORTVERSION= 0.4.3 +PORTVERSION= 0.4.5 CATEGORIES= security MASTER_SITES= GOOGLE_CODE @@ -14,25 +10,26 @@ COMMENT= Search binary images for embedd LICENSE= MIT -LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl +LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl PLIST_FILES= bin/binwalk \ etc/binwalk/magic.binarch \ etc/binwalk/magic.bincast \ etc/binwalk/magic.binwalk \ - etc/binwalk/magic.o PLIST_DIRS= etc/binwalk PORTDOCS= README GNU_CONFIGURE= yes -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src +.include + post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/docs/README ${DOCSDIR} .endif Modified: head/security/binwalk/distinfo ============================================================================== --- head/security/binwalk/distinfo Sun Oct 7 20:35:26 2012 (r305506) +++ head/security/binwalk/distinfo Sun Oct 7 20:43:21 2012 (r305507) @@ -1,2 +1,2 @@ -SHA256 (binwalk-0.4.3.tar.gz) = 2eceb316bfb65d43c3422caf5cdd3752ec5d79b1fed57253f47e8513cd9dcaac -SIZE (binwalk-0.4.3.tar.gz) = 701052 +SHA256 (binwalk-0.4.5.tar.gz) = 0797173ef20f581e7573976c70e4b2575656d56b482a9392a8795714436da2f0 +SIZE (binwalk-0.4.5.tar.gz) = 112526 Added: head/security/binwalk/files/patch-binwalk.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/binwalk/files/patch-binwalk.c Sun Oct 7 20:43:21 2012 (r305507) @@ -0,0 +1,15 @@ +--- ./binwalk.c.orig 2012-10-07 07:44:55.000000000 -0400 ++++ ./binwalk.c 2012-10-07 07:57:58.000000000 -0400 +@@ -78,7 +78,12 @@ + + /* Initialize default configuration settings */ + /* Thanks to dannyb for these flags - much improved scan times! */ ++#include ++#if __FreeBSD_version >= 800086 + config.flags = MAGIC_NO_CHECK_TEXT | MAGIC_NO_CHECK_ENCODING; ++#else ++ config.flags = MAGIC_NO_CHECK_ASCII; ++#endif + config.align = DEFAULT_BYTE_ALIGN; + config.smart = 1; +