diff -urN /usr/ports/cad/gerbv/Makefile cad/gerbv/Makefile
--- /usr/ports/cad/gerbv/Makefile	Tue Jul 16 05:00:33 2002
+++ cad/gerbv/Makefile	Wed Jul 24 05:21:03 2002
@@ -8,33 +8,34 @@
 
 PORTNAME=	gerbv
 PORTVERSION=	0.0.9
+#PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gdk_pixbuf:${PORTSDIR}/graphics/gdk-pixbuf \
-		png:${PORTSDIR}/graphics/png \
-		gnugetopt:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 USE_REINPLACE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
+CONFIGURE_ARGS=	--enable-exportpng
 
 MAN1=	gerbv.1
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|g" ${WRKSRC}/src/amacro.c
 
-.if !defined(NOPORTDOCS)
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
+	cd ${WRKSRC}/doc && pax -rw . ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/example/* ${EXAMPLESDIR}
+	cd ${WRKSRC}/example && pax -rw . ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/cad/gerbv/pkg-plist cad/gerbv/pkg-plist
--- /usr/ports/cad/gerbv/pkg-plist	Tue Jul 16 05:00:33 2002
+++ cad/gerbv/pkg-plist	Fri Jul 26 20:40:57 2002
@@ -1,11 +1,6 @@
 bin/gerbv
-share/gerbv/scheme/gerb-debug.scm
-share/gerbv/scheme/gerb-ps.scm
-@dirrm share/gerbv/scheme
-@dirrm share/gerbv
 %%PORTDOCS%%share/doc/gerbv/aperturemacro.txt
 %%PORTDOCS%%share/doc/gerbv/sources.txt
-%%PORTDOCS%%@dirrm share/doc/gerbv
 %%PORTDOCS%%share/examples/gerbv/Mentor-BoardStation/README.txt
 %%PORTDOCS%%share/examples/gerbv/Mentor-BoardStation/artwork_1.grb
 %%PORTDOCS%%share/examples/gerbv/am-test/am-test.gbx
@@ -16,9 +11,9 @@
 %%PORTDOCS%%share/examples/gerbv/dan/top.gbx
 %%PORTDOCS%%share/examples/gerbv/eaglecad1/top-cop.gbx
 %%PORTDOCS%%share/examples/gerbv/eaglecad1/top-cop.pdf
-%%PORTDOCS%%share/examples/gerbv/ekf/ekf_08.apt
 %%PORTDOCS%%share/examples/gerbv/ekf/README
 %%PORTDOCS%%share/examples/gerbv/ekf/ekf.gap
+%%PORTDOCS%%share/examples/gerbv/ekf/ekf_08.apt
 %%PORTDOCS%%share/examples/gerbv/ekf/l1.off
 %%PORTDOCS%%share/examples/gerbv/ekf2/README.txt
 %%PORTDOCS%%share/examples/gerbv/ekf2/d1.grb
@@ -63,13 +58,18 @@
 %%PORTDOCS%%share/examples/gerbv/orcad/rs232_cm.sst
 %%PORTDOCS%%share/examples/gerbv/orcad/rs232_cm.top
 %%PORTDOCS%%share/examples/gerbv/orcad/thruhole.tap
-%%PORTDOCS%%@dirrm share/examples/gerbv/Mentor-BoardStation
-%%PORTDOCS%%@dirrm share/examples/gerbv/am-test
-%%PORTDOCS%%@dirrm share/examples/gerbv/cslk
-%%PORTDOCS%%@dirrm share/examples/gerbv/dan
-%%PORTDOCS%%@dirrm share/examples/gerbv/eaglecad1
-%%PORTDOCS%%@dirrm share/examples/gerbv/ekf
-%%PORTDOCS%%@dirrm share/examples/gerbv/ekf2
-%%PORTDOCS%%@dirrm share/examples/gerbv/nollezappare
-%%PORTDOCS%%@dirrm share/examples/gerbv/numpres
+share/gerbv/scheme/gerb-debug.scm
+share/gerbv/scheme/gerb-ps.scm
+@dirrm share/gerbv/scheme
+@dirrm share/gerbv
 %%PORTDOCS%%@dirrm share/examples/gerbv/orcad
+%%PORTDOCS%%@dirrm share/examples/gerbv/numpres
+%%PORTDOCS%%@dirrm share/examples/gerbv/nollezappare
+%%PORTDOCS%%@dirrm share/examples/gerbv/ekf2
+%%PORTDOCS%%@dirrm share/examples/gerbv/ekf
+%%PORTDOCS%%@dirrm share/examples/gerbv/eaglecad1
+%%PORTDOCS%%@dirrm share/examples/gerbv/dan
+%%PORTDOCS%%@dirrm share/examples/gerbv/cslk
+%%PORTDOCS%%@dirrm share/examples/gerbv/am-test
+%%PORTDOCS%%@dirrm share/examples/gerbv/Mentor-BoardStation
+%%PORTDOCS%%@dirrm share/doc/gerbv