Update to 0.4.5

PR:		ports/45620
Submitted by:	Ports Fury

5 files changed, 63 insertions, 42 deletions

diff --git a/devel/libmba/Makefile b/devel/libmba/Makefile
index 3c37b05f4957..f4ea5d65c98c 100644
--- a/devel/libmba/Makefile
+++ b/devel/libmba/Makefile
@@ -7,29 +7,23 @@
 #
 
 PORTNAME=	libmba
-PORTVERSION=	0.3.6
+PORTVERSION=	0.4.5
 CATEGORIES=	devel
-MASTER_SITES=	http://users.erols.com/mballen/libmba/src/
+MASTER_SITES=	http://www.eskimo.com/~miallen/libmba/dl/
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
-SHLIB_MAJOR=	0
-
-USE_REINPLACE=	yes
-CFLAGS=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
-MAKE_ENV=	SHLIB_MAJOR="${SHLIB_MAJOR}" INSTDIR=${PREFIX}
-ALL_TARGET=	# empty
+USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
+SHLIB_MAJOR=	0
+MAKE_ENV=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
+MAN3=		cfg.3m domnode.3m mbs.3m msgno.3m hashmap.3m hexdump.3m \
+		linkedlist.3m stack.3m
 MANCOMPRESSED=	yes
-MAN3=	domnode.3m hexdump.3m msgno.3m hashmap.3m linkedlist.3m stack.3m
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|/usr|${PREFIX}|g" \
-		-e "s|gcc|${CC}|g" ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/devel/libmba/distinfo b/devel/libmba/distinfo
index 0569961ee958..d4fa4ba02e55 100644
--- a/devel/libmba/distinfo
+++ b/devel/libmba/distinfo
@@ -1 +1 @@
-MD5 (libmba-0.3.6.tar.gz) = ea368594e410da2ae80b21c805fb8968
+MD5 (libmba-0.4.5.tar.gz) = 979827b1ef8ee84369ea63e12ea861d6
diff --git a/devel/libmba/files/patch-Makefile b/devel/libmba/files/patch-Makefile
index 822390b4fd77..935233dc582c 100644
--- a/devel/libmba/files/patch-Makefile
+++ b/devel/libmba/files/patch-Makefile
@@ -1,33 +1,58 @@
---- Makefile.orig	Fri Mar 29 17:23:23 2002
-+++ Makefile	Tue Sep 24 15:51:24 2002
-@@ -3,9 +3,9 @@
- libdir    = /usr/lib
- mandir    = /usr/man
- LIBNAME   = mba
--SONAME    = lib$(LIBNAME).so.0.3.6
--SOVERSION = lib$(LIBNAME).so.0.3
--CFLAGS    = -Wall -DMSGNO $(RPM_OPT_FLAGS)
-+SONAME    = lib$(LIBNAME).so.${SHLIB_MAJOR}
-+SOVERSION = lib$(LIBNAME).so.${SHLIB_MAJOR}
-+CFLAGS    += -Wall -DMSGNO $(RPM_OPT_FLAGS)
- OBJS      = src/stack.o src/linkedlist.o src/hashmap.o src/profile.o src/hexdump.o src/msgno.o src/domnode.o src/mbs.o
- HDRS      = src/msgno.h src/stack.h src/linkedlist.h src/hashmap.h src/hexdump.h src/domnode.h src/profile.h src/mbs.h
- MAN       = msgno.3m.gz stack.3m.gz linkedlist.3m.gz hashmap.3m.gz hexdump.3m.gz domnode.3m.gz
-@@ -17,13 +17,12 @@
+--- Makefile.orig	Sun Nov 17 10:37:18 2002
++++ Makefile	Tue Nov 19 07:54:45 2002
+@@ -1,17 +1,17 @@
+-prefix     = /usr/local
++prefix     = ${PREFIX}
+ includedir = $(prefix)/include
+ libdir     = $(prefix)/lib
+ mandir     = $(prefix)/man
+-CC         = gcc
++CC         ?= gcc
+ LIBNAME    = mba
+-MAJVERSION = 0.4
+-MINVERSION = 0.4.5
++MAJVERSION = ${SHLIB_MAJOR}
++MINVERSION = ${SHLIB_MAJOR}
+ ARNAME     = lib$(LIBNAME).a
+ SONAME     = lib$(LIBNAME).so.$(MINVERSION)
+ SOVERSION  = lib$(LIBNAME).so.$(MAJVERSION)
+ DISTRO     = lib$(LIBNAME)-$(MINVERSION)
+ RPM_OPT_FLAGS = -O2
+-CFLAGS     = -Wall -W -DMSGNO -I$(includedir) -L$(libdir) $(RPM_OPT_FLAGS)
++CFLAGS     += -DMSGNO -I${LOCALBASE}/include
+ #CFLAGS     = -Wall -W -DMSGNO -I$(includedir) -L$(libdir) $(RPM_OPT_FLAGS) -ansi -pedantic -Wbad-function-cast -Wcast-align -Wcast-qual -Wchar-subscripts -Winline -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings -Wtraditional -Wconversion -Waggregate-return -Wno-parentheses
+ OBJS       = src/stack.o src/linkedlist.o src/hashmap.o src/profile.o src/hexdump.o src/msgno.o src/domnode.o src/mbs.o src/cfg.o
+ HDRS       = src/msgno.h src/stack.h src/linkedlist.h src/hashmap.h src/hexdump.h src/domnode.h src/profile.h src/mbs.h src/cfg.h
+@@ -20,7 +20,7 @@
+ all: $(ARNAME)($(OBJS)) $(SONAME)
+ 
+ $(SONAME): $(ARNAME)($(OBJS)) $(OBJS)
+-	$(CC) -shared $(OBJS) -L$(libdir) -lc -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME)
++	$(CC) -shared $(OBJS) -L${LOCALBASE}/lib -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME)
+ 
+ .c.a:
+ 	$(CC) $(CFLAGS) -c $< -o $*.o
+@@ -31,15 +31,14 @@
+ 	$(CC) $(CFLAGS) -fpic -c -o $*.o $<
  
  install: $(SONAME)
- 	install -d $(libdir)
+-	install -d $(libdir)
+-	install -d $(includedir)/mba
+-	install -d $(mandir)/man3
+-	install -m 644 $(ARNAME) $(libdir)
 -	install -m 755 $(SONAME) $(libdir)
 -	cd $(libdir) && ln -sf $(SONAME) $(SOVERSION) && ln -sf $(SONAME) lib$(LIBNAME).so
-+	${BSD_INSTALL_DATA} $(SONAME) $(INSTDIR)/lib
-+	cd $(INSTDIR)/lib ; ln -sf $(SONAME) $(INSTDIR)/lib/lib$(LIBNAME).so
- 	install -d $(includedir)/mba
 -	install -m 444 $(HDRS) $(includedir)/mba
-+	${BSD_INSTALL_DATA} $(HDRS) $(includedir)/mba
- 	install -d $(mandir)/man3
--	install -m 444 docs/man/* $(mandir)/man3
+-	-install -m 444 docs/man/*.3m.gz $(mandir)/man3
 -	-/sbin/ldconfig $(libdir)
-+	${BSD_INSTALL_MAN} docs/man/* $(mandir)/man3
++	mkdir -p $(libdir)
++	mkdir -p $(includedir)/mba
++	mkdir -p $(mandir)/man3
++	${BSD_INSTALL_DATA} $(ARNAME) $(libdir)
++	${BSD_INSTALL_DATA} $(SONAME) $(libdir)
++	cd $(libdir) && ln -sf $(SONAME) lib$(LIBNAME).so
++	${BSD_INSTALL_DATA} $(HDRS) $(includedir)/mba
++	${BSD_INSTALL_DATA} docs/man/*.3m.gz $(mandir)/man3
  
- clean:
- 	rm -rf $(includedir)/mba
+ zip:
+ 	cd .. && zip -lr $(DISTRO)/.$(DISTRO).zip $(DISTRO) -x $(DISTRO)/.* $(DISTRO)/docs/man/* $(DISTRO)/tests/data* $(DISTRO)/libmba.lib $(DISTRO)/libmba.dll $(DISTRO)/libmba_s.lib
diff --git a/devel/libmba/pkg-descr b/devel/libmba/pkg-descr
index ba99a1578b4e..a5e02f3b11ad 100644
--- a/devel/libmba/pkg-descr
+++ b/devel/libmba/pkg-descr
@@ -4,4 +4,4 @@ like interface that can load and store XML files for simple XML processing, a
 module for managing error codes and associated messages across separate C
 libraries, and more.
 
-WWW: http://users.erols.com/mballen/libmba/
+WWW: http://www.erols.com/~mballen/libmba/
diff --git a/devel/libmba/pkg-plist b/devel/libmba/pkg-plist
index 28caa9babdf8..96634ae7ec8c 100644
--- a/devel/libmba/pkg-plist
+++ b/devel/libmba/pkg-plist
@@ -1,3 +1,4 @@
+include/mba/cfg.h
 include/mba/domnode.h
 include/mba/hashmap.h
 include/mba/hexdump.h
@@ -6,6 +7,7 @@ include/mba/mbs.h
 include/mba/msgno.h
 include/mba/profile.h
 include/mba/stack.h
-@dirrm include/mba
+lib/libmba.a
 lib/libmba.so
 lib/libmba.so.%%SHLIB_MAJOR%%
+@dirrm include/mba