upgrade to 0.6.0

this version depends on expat2 so that we can nuke expat

Approved by:	kris

6 files changed, 37 insertions, 58 deletions

diff --git a/textproc/domc/Makefile b/textproc/domc/Makefile
index 6a3d6141668d..f4c2bdf3cb72 100644
--- a/textproc/domc/Makefile
+++ b/textproc/domc/Makefile
@@ -7,25 +7,27 @@
 #
 
 PORTNAME=	domc
-PORTVERSION=	0.5.8
+PORTVERSION=	0.6.0
 CATEGORIES=	textproc
-MASTER_SITES=	http://auditorymodels.org/domc/src/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://users.erols.com/mballen/domc/src/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	expat.1:${PORTSDIR}/textproc/expat
+LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2 \
+		mba:${PORTSDIR}/devel/libmba
 
 SHLIB_MAJOR=	0
 
-MAKE_ENV=	SHLIB_MAJOR="${SHLIB_MAJOR}"
+USE_REINPLACE=	yes
+CFLAGS=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
+MAKE_ENV=	SHLIB_MAJOR="${SHLIB_MAJOR}" INSTDIR=${PREFIX}
+ALL_TARGET=	# empty
 INSTALLS_SHLIB=	yes
+
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.* ${DOCSDIR}
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" \
+		-e "s|gcc|${CC}|g" ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/textproc/domc/distinfo b/textproc/domc/distinfo
index 0f6b80a045e3..adf249bcc00f 100644
--- a/textproc/domc/distinfo
+++ b/textproc/domc/distinfo
@@ -1 +1 @@
-MD5 (domc-0.5.8.tgz) = 318bf898a680af5b32399b78af31de06
+MD5 (domc-0.6.0.tar.gz) = e36cd468a58d6f272781c7d0f0c25cbe
diff --git a/textproc/domc/files/patch-Makefile b/textproc/domc/files/patch-Makefile
index f6ad1c422486..267e292647af 100644
--- a/textproc/domc/files/patch-Makefile
+++ b/textproc/domc/files/patch-Makefile
@@ -1,38 +1,30 @@
---- Makefile.orig	Thu Dec 20 19:16:25 2001
-+++ Makefile	Sun Dec 30 11:43:57 2001
-@@ -1,26 +1,26 @@
--INSTDIR   = /usr/local
-+INSTDIR   = ${PREFIX}
- OBJS      = src/expatls.o src/events.o src/node.o src/dom.o src/msgno.o src/stack.o
+--- 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.5.8
--SOVERSION = lib$(LIBNAME).so.0.5
+-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)
  
- all: lib$(LIBNAME).so
+ $(SONAME): $(OBJS)
+ 	gcc $(CFLAGS) -shared $(OBJS) -lc -lmba -lexpat -Wl,-soname -Wl,$(SOVERSION) -o $(SONAME)
+@@ -18,11 +18,10 @@
  
- lib$(LIBNAME).so: $(OBJS)
--	gcc -Wall -shared $(OBJS) -lc -Wl,-soname -Wl,$(SOVERSION) -o $(SONAME)
-+	${CC} ${CFLAGS} -shared $(OBJS) -Wl,-soname -Wl,$(SOVERSION) -o $(SONAME) -L${LOCALBASE}/lib -lexpat -Wl,-rpath ${LOCALBASE}/lib
+ install: $(SONAME)
+ 	install -d $(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)
+-	install -m 444 src/domc.h $(includedir)
+-	-/sbin/ldconfig $(libdir)
++	${BSD_INSTALL_DATA} src/domc.h $(INSTDIR)/include
  
  example:
  	$(MAKE) -C examples
- 
- install:
--	cp src/dom.h $(INSTDIR)/include/dom.h
--	cp src/msgno.h $(INSTDIR)/include/msgno.h
--	cp $(SONAME) $(INSTDIR)/lib
--	cd $(INSTDIR)/lib && ln -sf $(SONAME) $(SOVERSION) && ln -sf $(SONAME) lib$(LIBNAME).so
-+	${BSD_INSTALL_DATA} src/dom.h $(INSTDIR)/include/dom.h
-+	${BSD_INSTALL_DATA} src/msgno.h $(INSTDIR)/include/msgno.h
-+	${BSD_INSTALL_DATA} $(SONAME) $(INSTDIR)/lib
-+	ln -sf $(SONAME) $(INSTDIR)/lib/lib$(LIBNAME).so
- 
- clean:
- 	rm $(OBJS) $(SONAME) $(INSTDIR)/include/dom.h $(INSTDIR)/include/msgno.h $(INSTDIR)/lib/$(SONAME) $(INSTDIR)/lib/$(SOVERSION) $(INSTDIR)/lib/lib$(LIBNAME).so
- 	if [ -f examples/d5.o ]; then $(MAKE) -C examples clean; fi
- 
- .c.o:
--	gcc -Wall -I../include -Isrc -Lsrc -fPIC -DPIC -c -o $*.o $<
-+	${CC} ${CFLAGS} -I${LOCALBASE}/include/xml -I../include -Isrc -Lsrc -fPIC -DPIC -c -o $*.o $<
diff --git a/textproc/domc/files/patch-src::expatls.c b/textproc/domc/files/patch-src::expatls.c
deleted file mode 100644
index 352ebde3c041..000000000000
--- a/textproc/domc/files/patch-src::expatls.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/expatls.c.orig	Thu Dec 20 19:00:30 2001
-+++ src/expatls.c	Sun Dec 30 11:34:02 2001
-@@ -25,6 +25,7 @@
- /* expatls.c - DOM_DocumentLS
-  */
- 
-+#include <sys/types.h>
- #include <stdlib.h>
- #include <limits.h>
- #include <ctype.h>
diff --git a/textproc/domc/pkg-descr b/textproc/domc/pkg-descr
index 8b75ef4a87fe..cae519f8df4d 100644
--- a/textproc/domc/pkg-descr
+++ b/textproc/domc/pkg-descr
@@ -2,4 +2,4 @@ DOMC is a light weight implementation of the DOM in ANSI C as specified in
 the W3C Document Object Model Level 1, Level 2, and Level 2 Events
 recommendations. 
 
-WWW: http://auditorymodels.org/domc/
+WWW: http://users.erols.com/mballen/domc/
diff --git a/textproc/domc/pkg-plist b/textproc/domc/pkg-plist
index ad82fbd3f4a4..8be6dcf9b779 100644
--- a/textproc/domc/pkg-plist
+++ b/textproc/domc/pkg-plist
@@ -1,8 +1,3 @@
-include/dom.h
-include/msgno.h
+include/domc.h
 lib/libdomc.so
 lib/libdomc.so.%%SHLIB_MAJOR%%
-%%PORTDOCS%%share/doc/domc/domc.html
-%%PORTDOCS%%share/doc/domc/index.html
-%%PORTDOCS%%share/doc/domc/todo.txt
-%%PORTDOCS%%@dirrm share/doc/domc