upgrade to 1.8.3

PR:		44222
Submitted by:	Ports Fury
Approved by:	maintainer

6 files changed, 28 insertions, 46 deletions

diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 833f46d5d0c1..f9b4a927c2d9 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	gdbm
-PORTVERSION=	1.8.0
+PORTVERSION=	1.8.3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	gdbm
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	cyrille.lefevre@laposte.net
 
+USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
-USE_GMAKE=	yes
-# PREFIX isn't honored. force it w/ prefix.
-MAKE_ARGS=	prefix=${PREFIX}
 
 MAN3=		gdbm.3
 
diff --git a/databases/gdbm/distinfo b/databases/gdbm/distinfo
index 2f2edd94d483..6e0d22cf5e52 100644
--- a/databases/gdbm/distinfo
+++ b/databases/gdbm/distinfo
@@ -1 +1 @@
-MD5 (gdbm-1.8.0.tar.gz) = cd543862287f55ad66e62cc9d82cc906
+MD5 (gdbm-1.8.3.tar.gz) = 1d1b1d5c0245b1c00aff92da751e9aa1
diff --git a/databases/gdbm/files/patch-aa b/databases/gdbm/files/patch-aa
deleted file mode 100644
index 7669707f19e1..000000000000
--- a/databases/gdbm/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- gdbm.texinfo.orig	Sat Feb 14 16:25:48 1998
-+++ gdbm.texinfo	Sat Feb 14 16:28:33 1998
-@@ -2,6 +2,10 @@
- @comment %**start of header (This is for running Texinfo on a region.)
- @setfilename gdbm.info
- @settitle gdbm
-+@dircategory Programming & development tools
-+@direntry
-+* GDBM: (gdbm).			The GNU database manager.
-+@end direntry
- @c @setchapternewpage odd
- @comment %**end of header (This is for running Texinfo on a region.)
- 
diff --git a/databases/gdbm/files/patch-ab b/databases/gdbm/files/patch-ab
index 6a246ca0d7b9..5d19eaf34fa7 100644
--- a/databases/gdbm/files/patch-ab
+++ b/databases/gdbm/files/patch-ab
@@ -1,34 +1,20 @@
---- Makefile.in.orig	Wed May 19 11:16:06 1999
-+++ Makefile.in	Sun Feb 27 03:05:15 2000
-@@ -27,11 +27,11 @@
- LIBS = @LIBS@ -lc
+--- Makefile.in.orig	Wed Oct  9 01:09:12 2002
++++ Makefile.in	Tue Oct 22 22:19:59 2002
+@@ -24,7 +24,7 @@
+ DEFS =
  
- # SunOS 4 users might wish to add '-fpcc-struct-return' to CFLAGS. see INSTALL.
--CFLAGS = -O
-+#CFLAGS = -O
- LDFLAGS =
+ # Where the system [n]dbm routines are...
+-LIBS = @LIBS@ -lc
++LIBS = @LIBS@
  
- # Common prefix for installation directories
--prefix = /usr/local
-+prefix = @prefix@
- exec_prefix = $(prefix)
- binprefix = $(exec_prefix)
- manprefix = $(prefix)
-@@ -115,7 +115,7 @@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+@@ -122,7 +122,7 @@
  
  DISTFILES = $(SRCS) $(HDRS) $(MSCFILES)
  
--all: libgdbm.la
-+all: libgdbm.la info
+-all: libgdbm.la libgdbm_compat.la
++all: libgdbm.la libgdbm_compat.la gdbm.info
  
  progs: $(PROGS)
  
-@@ -187,7 +187,7 @@
- 
- info: gdbm.info
- 
--gdbm.info:
-+gdbm.info: gdbm.texinfo
- 	$(MAKEINFO) $(srcdir)/gdbm.texinfo
- 
- dvi: gdbm.dvi
diff --git a/databases/gdbm/files/patch-configure b/databases/gdbm/files/patch-configure
new file mode 100644
index 000000000000..75be7d85c377
--- /dev/null
+++ b/databases/gdbm/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Sep 28 08:23:50 2002
++++ configure	Wed Oct 16 06:15:31 2002
+@@ -6974,6 +6974,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/databases/gdbm/pkg-plist b/databases/gdbm/pkg-plist
index fe1676314666..092fb901b47f 100644
--- a/databases/gdbm/pkg-plist
+++ b/databases/gdbm/pkg-plist
@@ -4,4 +4,4 @@ info/gdbm.info
 @exec install-info %D/info/gdbm.info %D/info/dir
 lib/libgdbm.a
 lib/libgdbm.so
-lib/libgdbm.so.2
+lib/libgdbm.so.3