- Update to 0.8.0 (use libmba 0.8.10)

Submitted by:	Sam Lawrance <boris@brooknet.com.au>
PR:		ports/77816
Approved by:	arved (mentor)

4 files changed, 53 insertions, 46 deletions

diff --git a/textproc/domc/Makefile b/textproc/domc/Makefile
index 9d38e9884c77..d395c43abf32 100644
--- a/textproc/domc/Makefile
+++ b/textproc/domc/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	domc
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	0.8.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.ioplex.com/~miallen/domc/dl/
 
@@ -16,22 +15,21 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A light weight implementation of the DOM in ANSI C
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2 \
-		mba:${PORTSDIR}/devel/libmba
+		mba.1:${PORTSDIR}/devel/libmba
+
+MAN3=		DOM_CharacterData.3m DOM_Document.3m DOM_Element.3m \
+		DOM_Implementation.3m DOM_NamedNodeMap.3m DOM_Node.3m \
+		DOM_NodeList.3m DOM_Text.3m
+MANCOMPRESSED=	yes
 
 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
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+MAKE_ENV+=	SHLIB_MAJOR="${SHLIB_MAJOR}" INSTDIR=${PREFIX} LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" \
-		-e "s|gcc|${CC}|g" ${WRKSRC}/Makefile
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/domc/distinfo b/textproc/domc/distinfo
index 0596fac6e3b3..15952be358e6 100644
--- a/textproc/domc/distinfo
+++ b/textproc/domc/distinfo
@@ -1,2 +1,2 @@
-MD5 (domc-0.6.0.tar.gz) = e36cd468a58d6f272781c7d0f0c25cbe
-SIZE (domc-0.6.0.tar.gz) = 39758
+MD5 (domc-0.8.0.tar.gz) = fd797a30dd78d3fa9d8db92e44ce4d93
+SIZE (domc-0.8.0.tar.gz) = 122571
diff --git a/textproc/domc/files/patch-Makefile b/textproc/domc/files/patch-Makefile
index 267e292647af..7bcc75998ea9 100644
--- a/textproc/domc/files/patch-Makefile
+++ b/textproc/domc/files/patch-Makefile
@@ -1,30 +1,49 @@
---- Makefile.orig	Sun Mar 31 08:56:45 2002
-+++ Makefile	Tue Sep 24 15:54:47 2002
-@@ -4,9 +4,9 @@
- version   = 0.6.0
- OBJS      = src/expatls.o src/events.o src/node.o src/dom.o
- LIBNAME   = domc
--SONAME    = lib$(LIBNAME).so.0.6.0
--SOVERSION = lib$(LIBNAME).so.0.6
--CFLAGS    = -Wall -DMSGNO $(RPM_OPT_FLAGS)
-+SONAME    = lib$(LIBNAME).so.${SHLIB_MAJOR}
-+SOVERSION = lib$(LIBNAME).so.${SHLIB_MAJOR}
-+CFLAGS    += -Wall -DMSGNO $(RPM_OPT_FLAGS)
+--- Makefile.orig	Fri Sep 10 00:31:42 2004
++++ Makefile	Mon Mar  7 14:48:36 2005
+@@ -1,17 +1,15 @@
+-prefix     = /usr/local
++prefix     = ${PREFIX}
+ includedir = $(prefix)/include
+ libdir     = $(prefix)/lib
+ mandir     = $(prefix)/man
+-CC         = gcc
+ LIBNAME    = domc
+ MAJVERSION = 0.8
+ MINVERSION = 0.8.0
+ ARNAME     = lib$(LIBNAME).a
+-SONAME     = lib$(LIBNAME).so.$(MINVERSION)
+-SOVERSION  = lib$(LIBNAME).so.$(MAJVERSION)
++SONAME	   = lib$(LIBNAME).so.${SHLIB_MAJOR}
++SOVERSION  = lib$(LIBNAME).so.${SHLIB_MAJOR}
+ DISTRO     = $(LIBNAME)-$(MINVERSION)
+-RPM_OPT_FLAGS = -O2
+-CFLAGS     = -Wall -W -g -DMSGNO $(RPM_OPT_FLAGS) -I$(includedir) -L$(libdir)
++CFLAGS     += -Wall -W -g -DMSGNO -I$(includedir) -L$(libdir)
+ #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/expatls.o src/events.o src/node.o src/nodelist.o src/namednodemap.o src/dom.o src/timestamp.o src/wcwidth.o src/mbs.o
+ MAN        = DOM_CharacterData.3m.gz DOM_Document.3m.gz DOM_Element.3m.gz DOM_Implementation.3m.gz DOM_NamedNodeMap.3m.gz DOM_Node.3m.gz DOM_NodeList.3m.gz DOM_Text.3m.gz
+@@ -19,7 +17,7 @@
+ all: $(ARNAME)($(OBJS)) $(SONAME) src/defines.h
  
  $(SONAME): $(OBJS)
- 	gcc $(CFLAGS) -shared $(OBJS) -lc -lmba -lexpat -Wl,-soname -Wl,$(SOVERSION) -o $(SONAME)
-@@ -18,11 +18,10 @@
+-	$(CC) -shared $(OBJS) -L$(libdir) -lmba -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME)
++	$(CC) $(LDFLAGS) -shared $(OBJS) -L$(libdir) -lmba -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME)
  
- install: $(SONAME)
+ .c.a:
+ 	$(CC) $(CFLAGS) -c -o $*.o $<
+@@ -33,12 +31,10 @@
  	install -d $(libdir)
+ 	install -d $(includedir)
+ 	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
+-	install -m 444 src/domc.h $(includedir)
 +	${BSD_INSTALL_DATA} $(SONAME) $(INSTDIR)/lib
 +	cd $(INSTDIR)/lib ; ln -sf $(SONAME) $(INSTDIR)/lib/lib$(LIBNAME).so
- 	install -d $(includedir)
--	install -m 444 src/domc.h $(includedir)
--	-/sbin/ldconfig $(libdir)
 +	${BSD_INSTALL_DATA} src/domc.h $(INSTDIR)/include
+ 	-install -m 444 docs/man/*.3m.gz $(mandir)/man3
+-	-/sbin/ldconfig $(libdir)
  
- example:
- 	$(MAKE) -C examples
+ zip:
+ 	cd .. && zip -lr $(DISTRO)/.$(DISTRO).zip $(DISTRO) -x $(DISTRO)/.* $(DISTRO)/docs/man/* $(DISTRO)/tests/utf8* $(DISTRO)/domc.lib $(DISTRO)/domc.dll $(DISTRO)/domc_s.lib
diff --git a/textproc/domc/files/patch-node.c b/textproc/domc/files/patch-node.c
deleted file mode 100644
index a6c547bcbfc3..000000000000
--- a/textproc/domc/files/patch-node.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/node.c.orig	Tue Aug 17 13:26:21 2004
-+++ src/node.c	Tue Aug 17 13:27:55 2004
-@@ -381,6 +381,7 @@
-         case DOM_DOCUMENT_NODE:
-         case DOM_DOCUMENT_TYPE_NODE:
-         case DOM_NOTATION_NODE:
-+	    break;
-     }
-     free(node);
- }