4 files changed, 24 insertions, 64 deletions

diff --git a/devel/libmba/Makefile b/devel/libmba/Makefile
index c5c516a58c38..cdad76930fca 100644
--- a/devel/libmba/Makefile
+++ b/devel/libmba/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	libmba
-PORTVERSION=	0.5.1
+PORTVERSION=	0.6.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ioplex.com/~miallen/libmba/dl/
 
@@ -16,15 +16,30 @@ COMMENT=	A collection of C modules potentially useful to any project
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
-
-SHLIB_MAJOR=	0
-MAKE_ENV=	SHLIB_MAJOR="${SHLIB_MAJOR}"
+MAKE_ENV=	prefix="${PREFIX}" CC="${CC}" \
+		MINVERSION="${SHLIB_MAJOR}" \
+		RPM_OPT_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
+INSTALLS_SHLIB=	yes
 
-MAN3=		cfg.3m domnode.3m mbs.3m msgno.3m hashmap.3m hexdump.3m \
+MAN3=		cfg.3m csv.3m domnode.3m mbs.3m msgno.3m hashmap.3m hexdump.3m \
 		linkedlist.3m pool.3m shellout.3m stack.3m varray.3m
 MANCOMPRESSED=	yes
 
+SHLIB_MAJOR=	0
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|\$${PREFIX}|g ; \
+		 s|^CC|#CC|g ; \
+		 s|^MAJ|#MAJ|g ; \
+		 s|^MIN|#MIN|g ; \
+		 s|\.\$$(MAJVERSION)||g ; \
+		 s|^RPM_OPT_FLAGS|#RPM_OPT_FLAGS|g ; \
+		 s| -lc| \$${LDFLAGS}|g ; \
+		 s|install -m ...|\$${BSD_INSTALL_DATA}|g ; \
+		 s|-/sbin/ldconfig.*$$||g' ${WRKSRC}/Makefile
+
 .include <bsd.port.mk>
diff --git a/devel/libmba/distinfo b/devel/libmba/distinfo
index cb6e0c13af3c..1217263807fd 100644
--- a/devel/libmba/distinfo
+++ b/devel/libmba/distinfo
@@ -1 +1 @@
-MD5 (libmba-0.5.1.tar.gz) = 1f635afda3dd02a9249ca51aff74d6f5
+MD5 (libmba-0.6.0.tar.gz) = acc0d6754d1851d6dec0e37e5bba4a93
diff --git a/devel/libmba/files/patch-Makefile b/devel/libmba/files/patch-Makefile
deleted file mode 100644
index ef1f8414c5c6..000000000000
--- a/devel/libmba/files/patch-Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
---- Makefile.orig	Wed Apr  2 09:05:34 2003
-+++ Makefile	Tue Apr 15 12:37:37 2003
-@@ -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.5
--MINVERSION = 0.5.1
-+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 src/pool.o src/varray.o src/shellout.o
- HDRS       = src/mba/msgno.h src/mba/stack.h src/mba/linkedlist.h src/mba/hashmap.h src/mba/hexdump.h src/mba/domnode.h src/mba/profile.h src/mba/mbs.h src/mba/cfg.h src/mba/pool.h src/mba/varray.h src/mba/shellout.h
-@@ -20,7 +20,7 @@
- all: $(ARNAME)($(OBJS)) $(SONAME)
- 
- $(SONAME): $(ARNAME)($(OBJS)) $(OBJS)
--	$(CC) -shared $(OBJS) -L$(libdir) -lc -lexpat -lutil -Wl,-h,$(SOVERSION) -o $(SONAME)
-+	$(CC) -shared $(OBJS) -L${LOCALBASE}/lib -lexpat -lutil -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 $(includedir)/mba
--	install -d $(mandir)/man3
--	install -m 644 $(ARNAME) $(libdir)
--	install -m 755 $(SONAME) $(libdir)
-+	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) $(SOVERSION) && ln -sf $(SONAME) lib$(LIBNAME).so
--	install -m 444 $(HDRS) $(includedir)/mba
--	-install -m 444 docs/man/*.3m.gz $(mandir)/man3
--	-/sbin/ldconfig $(libdir)
-+	${BSD_INSTALL_DATA} $(HDRS) $(includedir)/mba
-+	${BSD_INSTALL_MAN} docs/man/*.3m.gz $(mandir)/man3
- 
- zip:
- 	-rm docs/www/dl
diff --git a/devel/libmba/pkg-plist b/devel/libmba/pkg-plist
index e6b32ed27fd6..8c6dab83c390 100644
--- a/devel/libmba/pkg-plist
+++ b/devel/libmba/pkg-plist
@@ -1,7 +1,9 @@
 include/mba/cfg.h
+include/mba/csv.h
 include/mba/domnode.h
 include/mba/hashmap.h
 include/mba/hexdump.h
+include/mba/iterator.h
 include/mba/linkedlist.h
 include/mba/mbs.h
 include/mba/msgno.h