svn commit: r308011 - in head/palm/palm-db-tools: . files

[Pietro Cerutti]

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);