upgrade to 3.1.0

6 files changed, 15 insertions, 22 deletions

diff --git a/devel/datadraw/Makefile b/devel/datadraw/Makefile
index dccb24051152..8778ad52a3ef 100644
--- a/devel/datadraw/Makefile
+++ b/devel/datadraw/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	datadraw
-PORTVERSION=	3.0.8
+PORTVERSION=	3.1.0
 CATEGORIES=	devel
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/devel/datadraw/distinfo b/devel/datadraw/distinfo
index ecbf41f45436..a1911f49c434 100644
--- a/devel/datadraw/distinfo
+++ b/devel/datadraw/distinfo
@@ -1,3 +1,3 @@
-MD5 (datadraw3.0.8.tar.gz) = 2f5e4d9e2be7190ad6f7f5c083a299b2
-SHA256 (datadraw3.0.8.tar.gz) = 983985bcb95e530386b2157e56650fab6d75b9aa186fc6b10ad88dd0f524af1d
-SIZE (datadraw3.0.8.tar.gz) = 710274
+MD5 (datadraw3.1.0.tar.gz) = bbea790c1028c4f192ef77320368dc45
+SHA256 (datadraw3.1.0.tar.gz) = 7151f968ce07937c073a05640b894a85d1bd130a6565a7f9091e4c9ac3696dba
+SIZE (datadraw3.1.0.tar.gz) = 684093
diff --git a/devel/datadraw/files/patch-configure b/devel/datadraw/files/patch-configure
index 70a35e1c26e6..174a9bec0cbb 100644
--- a/devel/datadraw/files/patch-configure
+++ b/devel/datadraw/files/patch-configure
@@ -1,12 +1,12 @@
---- configure.orig	Fri Aug 31 15:45:53 2007
-+++ configure	Fri Aug 31 15:46:19 2007
+--- configure.orig	Thu Dec 20 11:22:14 2007
++++ configure	Thu Dec 20 11:24:39 2007
 @@ -16,7 +16,7 @@
  if [ "$CC" = "" ]; then
      CC=gcc
  fi
 -CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -Iutil"
 +CFLAGS="${CFLAGS} -Iutil"
- LIBS="util/ddutil.a"
+ LIBS="util/ddutil-dbg.a"
  
  if [ "`uname -m`" = x86_64 ]; then
 @@ -79,12 +79,12 @@
@@ -27,7 +27,7 @@
 @@ -100,7 +100,7 @@
  	datadraw src/Database.dd
  
- util/ddutil.a:
+ util/ddutil-dbg.a:
 -	make -C util
 +	gmake -C util
  
diff --git a/devel/datadraw/files/patch-util_configure b/devel/datadraw/files/patch-util_configure
index 0ab499e09649..8348671b7962 100644
--- a/devel/datadraw/files/patch-util_configure
+++ b/devel/datadraw/files/patch-util_configure
@@ -1,10 +1,10 @@
---- util/configure.orig	Fri Aug 31 17:44:25 2007
-+++ util/configure	Fri Aug 31 17:44:45 2007
+--- util/configure.orig	Thu Dec 20 11:27:23 2007
++++ util/configure	Thu Dec 20 11:27:57 2007
 @@ -10,7 +10,7 @@
  if [ "$CC" = "" ]; then
      CC=gcc
  fi
--CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG"
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function"
 +CFLAGS="${CFLAGS}"
  
  if [ "`uname -m`" = "x86_64" ]; then
diff --git a/devel/datadraw/files/patch-util_util.c b/devel/datadraw/files/patch-util_util.c
deleted file mode 100644
index d5bdd199a547..000000000000
--- a/devel/datadraw/files/patch-util_util.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/util.c.orig	Fri Aug 31 15:40:23 2007
-+++ util/util.c	Fri Aug 31 15:40:29 2007
-@@ -158,7 +158,7 @@
- {
-     va_list ap;
-     char *buff;
--    uint timerID = utTimerDepth++;
-+    uint16 timerID = utTimerDepth++;
- 
-     utTimers[timerID] = time(NULL);
-     if(format != NULL) {
diff --git a/devel/datadraw/pkg-plist b/devel/datadraw/pkg-plist
index 5b7fc428f9e8..6794a11f9844 100644
--- a/devel/datadraw/pkg-plist
+++ b/devel/datadraw/pkg-plist
@@ -7,7 +7,11 @@ include/utdatabaseup.h
 include/utmem.h
 include/utpersist.h
 include/uttypes.h
+lib/libddutil-dbg.a
 lib/libddutil.a
+lib/libddutilp-dbg.a
 lib/libddutilp.a
+lib/libddutilu-dbg.a
 lib/libddutilu.a
+lib/libddutilup-dbg.a
 lib/libddutilup.a