Update to 0.4.5

PR:		ports/45620
Submitted by:	Ports Fury

1 files changed, 51 insertions, 26 deletions

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