From owner-svn-ports-head@FreeBSD.ORG  Fri Nov 30 13:53:05 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 BE15D5AB;
 Fri, 30 Nov 2012 13:53:05 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8928F8FC12;
 Fri, 30 Nov 2012 13:53:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAUDr50f094659;
 Fri, 30 Nov 2012 13:53:05 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAUDr5mU094657;
 Fri, 30 Nov 2012 13:53:05 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201211301353.qAUDr5mU094657@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Fri, 30 Nov 2012 13:53:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308011 - in head/palm/palm-db-tools: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Nov 2012 13:53:05 -0000

Author: gahr
Date: Fri Nov 30 13:53:05 2012
New Revision: 308011
URL: http://svnweb.freebsd.org/changeset/ports/308011

Log:
  - Fix the code instead of suppressing the compiler error
  
  Feature safe:	yes
  Approved by:	bapt (previous commit was his)

Added:
  head/palm/palm-db-tools/files/patch-libflatfile-Database.cpp   (contents, props changed)
Modified:
  head/palm/palm-db-tools/Makefile   (contents, props changed)

Modified: head/palm/palm-db-tools/Makefile
==============================================================================
--- head/palm/palm-db-tools/Makefile	Fri Nov 30 13:33:13 2012	(r308010)
+++ head/palm/palm-db-tools/Makefile	Fri Nov 30 13:53:05 2012	(r308011)
@@ -20,7 +20,7 @@ PLIST_FILES=	lib/libpdbtools.so \
 		bin/pdb2csv
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|-Wno-deprecated|& -fPIC -DPIC -Wno-error|" \
+	@${REINPLACE_CMD} -e "s|-Wno-deprecated|& -fPIC -DPIC|" \
 		${WRKSRC}/libflatfile/Makefile.in ${WRKSRC}/libpalm/Makefile.in \
 		${WRKSRC}/libsupport/Makefile.in ${WRKSRC}/flatfile/Makefile.in
 

Added: head/palm/palm-db-tools/files/patch-libflatfile-Database.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/palm/palm-db-tools/files/patch-libflatfile-Database.cpp	Fri Nov 30 13:53:05 2012	(r308011)
@@ -0,0 +1,11 @@
+--- libflatfile/Database.cpp.orig	2012-11-30 14:43:18.000000000 +0100
++++ libflatfile/Database.cpp	2012-11-30 14:48:11.000000000 +0100
+@@ -208,7 +208,7 @@
+     // Ensure that the field numbers are within range.
+     for (PalmLib::FlatFile::ListView::const_iterator i = lv.begin();
+          i != lv.end(); ++i) {
+-        if ((*i).field < 0 || (*i).field >= getNumOfFields())
++        if ((*i).field >= getNumOfFields())
+             return;
+     }
+     m_listviews.push_back(lv);