10 files changed, 76 insertions, 30 deletions

diff --git a/devel/domc/Makefile b/devel/domc/Makefile
index 09759de64675..93c7584ea3d9 100644
--- a/devel/domc/Makefile
+++ b/devel/domc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	domc
-PORTVERSION=	0.5.0
+PORTVERSION=	0.5.1
 CATEGORIES=	devel
 MASTER_SITES=	http://auditorymodels.org/domc/src/
 EXTRACT_SUFX=	.tgz
@@ -16,19 +16,20 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	expat.1:${PORTSDIR}/textproc/expat
 
-CFLAGS+=	-I${LOCALBASE}/include/xml
 SHLIB_MAJOR=	0
+
+MAKE_ENV=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-post-patch:
-	@${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g ; \
-		s,%%CFLAGS%%,${CFLAGS},g" ${WRKSRC}/Makefile
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/dom.h ${PREFIX}/include
 	${CAT} ${WRKSRC}/include/stack.h >> ${PREFIX}/include/dom.h
-	${INSTALL_DATA} ${WRKSRC}/libdomc.so.0.5.0 ${PREFIX}/lib/libdomc.so.${SHLIB_MAJOR}
-	${LN} -sf ${PREFIX}/lib/libdomc.so.${SHLIB_MAJOR} ${PREFIX}/lib/libdomc.so
+	${INSTALL_DATA} ${WRKSRC}/libdomc.so.${SHLIB_MAJOR} ${PREFIX}/lib
+	${LN} -sf libdomc.so.${SHLIB_MAJOR} ${PREFIX}/lib/libdomc.so
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.* ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/domc/distinfo b/devel/domc/distinfo
index 7a2db83afee4..0e6aba5ed56d 100644
--- a/devel/domc/distinfo
+++ b/devel/domc/distinfo
@@ -1 +1 @@
-MD5 (domc-0.5.0.tgz) = cb2acc946cedc4fb6c3e5d2816949e41
+MD5 (domc-0.5.1.tgz) = 73f1dc3cd9df88446804a218b750f3e9
diff --git a/devel/domc/files/patch-Makefile b/devel/domc/files/patch-Makefile
index f20efc5b41c5..fd1c21a38ab8 100644
--- a/devel/domc/files/patch-Makefile
+++ b/devel/domc/files/patch-Makefile
@@ -1,9 +1,27 @@
---- Makefile.orig	Mon Aug 27 15:03:28 2001
-+++ Makefile	Tue Oct  9 13:18:10 2001
-@@ -24,5 +24,5 @@
- 	if [ -f examples/d5.o ]; then $(MAKE) -C examples clean; fi
+--- Makefile.orig	Sat Oct 27 13:40:45 2001
++++ Makefile	Thu Nov 22 03:34:09 2001
+@@ -1,13 +1,13 @@
+-INSTDIR   = /usr/local
++INSTDIR   = ${PREFIX}
+ OBJS      = lib/expatls.o lib/events.o lib/node.o lib/dom.o lib/stack.o
+ LIBNAME   = domc
+-SONAME    = lib$(LIBNAME).so.0.5.0
+-SOVERSION = lib$(LIBNAME).so.0.5
++SONAME    = lib$(LIBNAME).so.${SHLIB_MAJOR}
++SOVERSION = lib$(LIBNAME).so.${SHLIB_MAJOR}
+ 
+ all: lib$(LIBNAME).so
+ 
+ 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
+ 
+ example:
+ 	$(MAKE) -C examples
+@@ -25,5 +25,5 @@
+ 	@echo "Expat was not removed however"
  
  .c.o:
 -	gcc -Wall -Iinclude -Llib -fPIC -DPIC -c -o $*.o $<
-+	gcc %%CFLAGS%% -Wall -Iinclude -Llib -fPIC -DPIC -c -o $*.o $<
++	${CC} ${CFLAGS} -I${LOCALBASE}/include/xml -Iinclude -Llib -fPIC -DPIC -c -o $*.o $<
  
diff --git a/devel/domc/pkg-comment b/devel/domc/pkg-comment
index 3867ed5b4f80..e09ab8b91584 100644
--- a/devel/domc/pkg-comment
+++ b/devel/domc/pkg-comment
@@ -1 +1 @@
-DOMC is a light weight implementation of the DOM in ANSI C
+A light weight implementation of the DOM in ANSI C
diff --git a/devel/domc/pkg-plist b/devel/domc/pkg-plist
index 4883a0715ddd..ce41f6a9fcc7 100644
--- a/devel/domc/pkg-plist
+++ b/devel/domc/pkg-plist
@@ -1,3 +1,7 @@
 include/dom.h
 lib/libdomc.so
 lib/libdomc.so.%%SHLIB_MAJOR%%
+%%PORTDOCS%%share/doc/domc/apinotes.html
+%%PORTDOCS%%share/doc/domc/index.html
+%%PORTDOCS%%share/doc/domc/todo.txt
+%%PORTDOCS%%@dirrm share/doc/domc
diff --git a/textproc/domc/Makefile b/textproc/domc/Makefile
index 09759de64675..93c7584ea3d9 100644
--- a/textproc/domc/Makefile
+++ b/textproc/domc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	domc
-PORTVERSION=	0.5.0
+PORTVERSION=	0.5.1
 CATEGORIES=	devel
 MASTER_SITES=	http://auditorymodels.org/domc/src/
 EXTRACT_SUFX=	.tgz
@@ -16,19 +16,20 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	expat.1:${PORTSDIR}/textproc/expat
 
-CFLAGS+=	-I${LOCALBASE}/include/xml
 SHLIB_MAJOR=	0
+
+MAKE_ENV=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-post-patch:
-	@${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g ; \
-		s,%%CFLAGS%%,${CFLAGS},g" ${WRKSRC}/Makefile
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/dom.h ${PREFIX}/include
 	${CAT} ${WRKSRC}/include/stack.h >> ${PREFIX}/include/dom.h
-	${INSTALL_DATA} ${WRKSRC}/libdomc.so.0.5.0 ${PREFIX}/lib/libdomc.so.${SHLIB_MAJOR}
-	${LN} -sf ${PREFIX}/lib/libdomc.so.${SHLIB_MAJOR} ${PREFIX}/lib/libdomc.so
+	${INSTALL_DATA} ${WRKSRC}/libdomc.so.${SHLIB_MAJOR} ${PREFIX}/lib
+	${LN} -sf libdomc.so.${SHLIB_MAJOR} ${PREFIX}/lib/libdomc.so
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.* ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/domc/distinfo b/textproc/domc/distinfo
index 7a2db83afee4..0e6aba5ed56d 100644
--- a/textproc/domc/distinfo
+++ b/textproc/domc/distinfo
@@ -1 +1 @@
-MD5 (domc-0.5.0.tgz) = cb2acc946cedc4fb6c3e5d2816949e41
+MD5 (domc-0.5.1.tgz) = 73f1dc3cd9df88446804a218b750f3e9
diff --git a/textproc/domc/files/patch-Makefile b/textproc/domc/files/patch-Makefile
index f20efc5b41c5..fd1c21a38ab8 100644
--- a/textproc/domc/files/patch-Makefile
+++ b/textproc/domc/files/patch-Makefile
@@ -1,9 +1,27 @@
---- Makefile.orig	Mon Aug 27 15:03:28 2001
-+++ Makefile	Tue Oct  9 13:18:10 2001
-@@ -24,5 +24,5 @@
- 	if [ -f examples/d5.o ]; then $(MAKE) -C examples clean; fi
+--- Makefile.orig	Sat Oct 27 13:40:45 2001
++++ Makefile	Thu Nov 22 03:34:09 2001
+@@ -1,13 +1,13 @@
+-INSTDIR   = /usr/local
++INSTDIR   = ${PREFIX}
+ OBJS      = lib/expatls.o lib/events.o lib/node.o lib/dom.o lib/stack.o
+ LIBNAME   = domc
+-SONAME    = lib$(LIBNAME).so.0.5.0
+-SOVERSION = lib$(LIBNAME).so.0.5
++SONAME    = lib$(LIBNAME).so.${SHLIB_MAJOR}
++SOVERSION = lib$(LIBNAME).so.${SHLIB_MAJOR}
+ 
+ all: lib$(LIBNAME).so
+ 
+ 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
+ 
+ example:
+ 	$(MAKE) -C examples
+@@ -25,5 +25,5 @@
+ 	@echo "Expat was not removed however"
  
  .c.o:
 -	gcc -Wall -Iinclude -Llib -fPIC -DPIC -c -o $*.o $<
-+	gcc %%CFLAGS%% -Wall -Iinclude -Llib -fPIC -DPIC -c -o $*.o $<
++	${CC} ${CFLAGS} -I${LOCALBASE}/include/xml -Iinclude -Llib -fPIC -DPIC -c -o $*.o $<
  
diff --git a/textproc/domc/pkg-comment b/textproc/domc/pkg-comment
index 3867ed5b4f80..e09ab8b91584 100644
--- a/textproc/domc/pkg-comment
+++ b/textproc/domc/pkg-comment
@@ -1 +1 @@
-DOMC is a light weight implementation of the DOM in ANSI C
+A light weight implementation of the DOM in ANSI C
diff --git a/textproc/domc/pkg-plist b/textproc/domc/pkg-plist
index 4883a0715ddd..ce41f6a9fcc7 100644
--- a/textproc/domc/pkg-plist
+++ b/textproc/domc/pkg-plist
@@ -1,3 +1,7 @@
 include/dom.h
 lib/libdomc.so
 lib/libdomc.so.%%SHLIB_MAJOR%%
+%%PORTDOCS%%share/doc/domc/apinotes.html
+%%PORTDOCS%%share/doc/domc/index.html
+%%PORTDOCS%%share/doc/domc/todo.txt
+%%PORTDOCS%%@dirrm share/doc/domc