diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index aab0528792e9..4e38e170778c 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gerbv
-PORTVERSION=	0.11
+PORTVERSION=	0.12
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/cad/gerbv/distinfo b/cad/gerbv/distinfo
index 9cf4df0fa840..821d9d2ce4db 100644
--- a/cad/gerbv/distinfo
+++ b/cad/gerbv/distinfo
@@ -1 +1 @@
-MD5 (gerbv-0.11.tar.gz) = 5864578375e532684b416e3273a506b7
+MD5 (gerbv-0.12.tar.gz) = b2df64d369e561471c937d48c7ba060a
diff --git a/cad/gerbv/pkg-plist b/cad/gerbv/pkg-plist
index 134db8d8ff4b..e6375d0ef4b3 100644
--- a/cad/gerbv/pkg-plist
+++ b/cad/gerbv/pkg-plist
@@ -1,81 +1,84 @@
 bin/gerbv
-%%PORTDOCS%%share/doc/gerbv/PNG-print/PNGPrintMiniHowto.txt
-%%PORTDOCS%%share/doc/gerbv/PNG-print/gimp-window.jpg
-%%PORTDOCS%%share/doc/gerbv/aperturemacro.txt
-%%PORTDOCS%%share/doc/gerbv/image2pixmap.fig
-%%PORTDOCS%%share/doc/gerbv/sources.txt
-%%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
-%%PORTDOCS%%share/examples/gerbv/cslk/README.txt
-%%PORTDOCS%%share/examples/gerbv/cslk/cslk.gbx
-%%PORTDOCS%%share/examples/gerbv/cslk/cslk.ps
-%%PORTDOCS%%share/examples/gerbv/dan/README.txt
-%%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/ekf2/README.txt
-%%PORTDOCS%%share/examples/gerbv/ekf2/d1.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/drill0.exc
-%%PORTDOCS%%share/examples/gerbv/ekf2/drill1.exc
-%%PORTDOCS%%share/examples/gerbv/ekf2/drill20.exc
-%%PORTDOCS%%share/examples/gerbv/ekf2/drill30.exc
-%%PORTDOCS%%share/examples/gerbv/ekf2/gnd.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/l0.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/l1.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/l2.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/l3.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/l4.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/l5.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/pow.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/pow3.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/resplan.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/sieb0.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/sieb1.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/stp0.grb
-%%PORTDOCS%%share/examples/gerbv/ekf2/stp1.grb
-%%PORTDOCS%%share/examples/gerbv/jj/README.txt
-%%PORTDOCS%%share/examples/gerbv/jj/l1-1.grb
-%%PORTDOCS%%share/examples/gerbv/jj/l1-2.grb
-%%PORTDOCS%%share/examples/gerbv/jj/l1-3.grb
-%%PORTDOCS%%share/examples/gerbv/jj/l1-orig.grb
-%%PORTDOCS%%share/examples/gerbv/nollezappare/AssemblyTop.gdo
-%%PORTDOCS%%share/examples/gerbv/nollezappare/EtchLayer2Bottom.gdo
-%%PORTDOCS%%share/examples/gerbv/nollezappare/ThruHolePlated.ncd
-%%PORTDOCS%%share/examples/gerbv/numpres/numpres.pcb
-%%PORTDOCS%%share/examples/gerbv/numpres/numpres.pcb.output_componentmask.grb
-%%PORTDOCS%%share/examples/gerbv/numpres/numpres.pcb.output_componentsilk.grb
-%%PORTDOCS%%share/examples/gerbv/numpres/numpres.pcb.output_group1.grb
-%%PORTDOCS%%share/examples/gerbv/numpres/numpres.pcb.output_group2.grb
-%%PORTDOCS%%share/examples/gerbv/numpres/numpres.pcb.output_plated-drill.grb
-%%PORTDOCS%%share/examples/gerbv/numpres/numpres.pcb.output_soldermask.grb
-%%PORTDOCS%%share/examples/gerbv/numpres/numpres.pcb.output_unplated-drill.grb
-%%PORTDOCS%%share/examples/gerbv/orcad/README.txt
-%%PORTDOCS%%share/examples/gerbv/orcad/ast.ps
-%%PORTDOCS%%share/examples/gerbv/orcad/rs232_cm.asb
-%%PORTDOCS%%share/examples/gerbv/orcad/rs232_cm.ast
-%%PORTDOCS%%share/examples/gerbv/orcad/rs232_cm.bot
-%%PORTDOCS%%share/examples/gerbv/orcad/rs232_cm.drd
-%%PORTDOCS%%share/examples/gerbv/orcad/rs232_cm.smb
-%%PORTDOCS%%share/examples/gerbv/orcad/rs232_cm.smt
-%%PORTDOCS%%share/examples/gerbv/orcad/rs232_cm.ssb
-%%PORTDOCS%%share/examples/gerbv/orcad/rs232_cm.sst
-%%PORTDOCS%%share/examples/gerbv/orcad/rs232_cm.top
-%%PORTDOCS%%share/examples/gerbv/orcad/thruhole.tap
-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/jj
-%%PORTDOCS%%@dirrm share/examples/gerbv/ekf2
-%%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/examples/gerbv
-%%PORTDOCS%%@dirrm share/doc/gerbv/PNG-print
-%%PORTDOCS%%@dirrm share/doc/gerbv
+%%DATADIR%%/scheme/gerb-debug.scm
+%%DATADIR%%/scheme/gerb-ps.scm
+@dirrm %%DATADIR%%/scheme
+@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/PNG-print/PNGPrintMiniHowto.txt
+%%PORTDOCS%%%%DOCSDIR%%/PNG-print/gimp-window.jpg
+%%PORTDOCS%%%%DOCSDIR%%/eagle/eagle2exc.pl
+%%PORTDOCS%%%%DOCSDIR%%/eagle/eagle2exc.txt
+%%PORTDOCS%%%%DOCSDIR%%/aperturemacro.txt
+%%PORTDOCS%%%%DOCSDIR%%/image2pixmap.fig
+%%PORTDOCS%%%%DOCSDIR%%/sources.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/Mentor-BoardStation/README.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/Mentor-BoardStation/artwork_1.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/am-test/am-test.gbx
+%%PORTDOCS%%%%EXAMPLESDIR%%/cslk/README.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/cslk/cslk.gbx
+%%PORTDOCS%%%%EXAMPLESDIR%%/cslk/cslk.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/dan/README.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/dan/top.gbx
+%%PORTDOCS%%%%EXAMPLESDIR%%/eaglecad1/top-cop.gbx
+%%PORTDOCS%%%%EXAMPLESDIR%%/eaglecad1/top-cop.pdf
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/README.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/d1.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/drill0.exc
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/drill1.exc
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/drill20.exc
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/drill30.exc
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/gnd.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/l0.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/l1.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/l2.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/l3.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/l4.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/l5.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/pow.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/pow3.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/resplan.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/sieb0.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/sieb1.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/stp0.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ekf2/stp1.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/jj/README.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/jj/l1-1.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/jj/l1-2.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/jj/l1-3.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/jj/l1-orig.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/nollezappare/AssemblyTop.gdo
+%%PORTDOCS%%%%EXAMPLESDIR%%/nollezappare/EtchLayer2Bottom.gdo
+%%PORTDOCS%%%%EXAMPLESDIR%%/nollezappare/ThruHolePlated.ncd
+%%PORTDOCS%%%%EXAMPLESDIR%%/numpres/numpres.pcb
+%%PORTDOCS%%%%EXAMPLESDIR%%/numpres/numpres.pcb.output_componentmask.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/numpres/numpres.pcb.output_componentsilk.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/numpres/numpres.pcb.output_group1.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/numpres/numpres.pcb.output_group2.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/numpres/numpres.pcb.output_plated-drill.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/numpres/numpres.pcb.output_soldermask.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/numpres/numpres.pcb.output_unplated-drill.grb
+%%PORTDOCS%%%%EXAMPLESDIR%%/orcad/README.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/orcad/ast.ps
+%%PORTDOCS%%%%EXAMPLESDIR%%/orcad/rs232_cm.asb
+%%PORTDOCS%%%%EXAMPLESDIR%%/orcad/rs232_cm.ast
+%%PORTDOCS%%%%EXAMPLESDIR%%/orcad/rs232_cm.bot
+%%PORTDOCS%%%%EXAMPLESDIR%%/orcad/rs232_cm.drd
+%%PORTDOCS%%%%EXAMPLESDIR%%/orcad/rs232_cm.smb
+%%PORTDOCS%%%%EXAMPLESDIR%%/orcad/rs232_cm.smt
+%%PORTDOCS%%%%EXAMPLESDIR%%/orcad/rs232_cm.ssb
+%%PORTDOCS%%%%EXAMPLESDIR%%/orcad/rs232_cm.sst
+%%PORTDOCS%%%%EXAMPLESDIR%%/orcad/rs232_cm.top
+%%PORTDOCS%%%%EXAMPLESDIR%%/orcad/thruhole.tap
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/orcad
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/numpres
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/nollezappare
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/jj
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/ekf2
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/eaglecad1
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/dan
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/cslk
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/am-test
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Mentor-BoardStation
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/PNG-print
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/eagle
+%%PORTDOCS%%@dirrm %%DOCSDIR%%