diff -urN /usr/ports/cad/gwave/Makefile cad/gwave/Makefile
--- /usr/ports/cad/gwave/Makefile	2012-06-01 22:18:20.000000000 +0900
+++ cad/gwave/Makefile	2012-06-02 05:48:39.000000000 +0900
@@ -9,23 +9,29 @@
 PORTVERSION=	20080127
 PORTREVISION=	6
 CATEGORIES=	cad
-MASTER_SITES=	http://geda.seul.org/dist/
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Waveform viewer for analogue electronic simulation tools
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile \
 		guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
 
+OPTIONS_DEFINE=	PLOTUTILS GNUPLOT DOCS EXAMPLES
+OPTIONS_DEFAULT=GNUPLOT
+PLOTUTILS_DESC=	Enable plotting using plotutils
+
 USE_GNOME=	gtk12
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	PLOTUTILS GNUPLOT EXAMPLES
-OPTIONS_DEFAULT=	GNUPLOT
-PLOTUTILS_DESC=	Enable plotting using plotutils
+MAN1=		sp2sp.1
 
 DOCFILES=	Guile.notes \
 		gwave-concepts.txt \
@@ -36,8 +42,6 @@
 		hspice.txt \
 		spice3.txt
 
-MAN1=		sp2sp.1
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPLOTUTILS}
@@ -52,16 +56,12 @@
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
 .endfor
 .endif
-
-.if ${PORT_OPTIONS:MEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
-PLIST_SUB+=	EXAMPLES=""
-.else
-PLIST_SUB+=	EXAMPLES="@comment "
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/cad/gwave/pkg-descr cad/gwave/pkg-descr
--- /usr/ports/cad/gwave/pkg-descr	2003-10-15 17:06:26.000000000 +0900
+++ cad/gwave/pkg-descr	2012-05-30 04:24:59.000000000 +0900
@@ -16,4 +16,4 @@
 language and is therefore easily extensible for custom applications
 without recompilation.
 
-WWW: http://www.telltronics.org/software/gwave
+WWW: http://gwave.sourceforge.net/
diff -urN /usr/ports/cad/gwave/pkg-plist cad/gwave/pkg-plist
--- /usr/ports/cad/gwave/pkg-plist	2009-06-09 20:16:57.000000000 +0900
+++ cad/gwave/pkg-plist	2012-05-30 04:35:13.000000000 +0900
@@ -11,25 +11,25 @@
 %%PORTDOCS%%%%DOCSDIR%%/hspice-output.txt
 %%PORTDOCS%%%%DOCSDIR%%/hspice.txt
 %%PORTDOCS%%%%DOCSDIR%%/spice3.txt
-%%EXAMPLES%%%%EXAMPLESDIR%%/Readme
-%%EXAMPLES%%%%EXAMPLESDIR%%/aoi.W
-%%EXAMPLES%%%%EXAMPLESDIR%%/aoi.W.tr0
-%%EXAMPLES%%%%EXAMPLESDIR%%/diffpair.braw
-%%EXAMPLES%%%%EXAMPLESDIR%%/diffpair.sp
-%%EXAMPLES%%%%EXAMPLESDIR%%/lpf.ac0
-%%EXAMPLES%%%%EXAMPLESDIR%%/lpf.sp
-%%EXAMPLES%%%%EXAMPLESDIR%%/nand.N.tr0
-%%EXAMPLES%%%%EXAMPLESDIR%%/nisrc.N.sw0
-%%EXAMPLES%%%%EXAMPLESDIR%%/pd1.N.tr0
-%%EXAMPLES%%%%EXAMPLESDIR%%/pd2.N
-%%EXAMPLES%%%%EXAMPLESDIR%%/quickAC.ac0
-%%EXAMPLES%%%%EXAMPLESDIR%%/quickINV.tr0
-%%EXAMPLES%%%%EXAMPLESDIR%%/quickTRAN.tr0
-%%EXAMPLES%%%%EXAMPLESDIR%%/rcsq.raw
-%%EXAMPLES%%%%EXAMPLESDIR%%/rcsq.sp
-%%EXAMPLES%%%%EXAMPLESDIR%%/test1.tr0.binary
-%%EXAMPLES%%%%EXAMPLESDIR%%/tlong.tr0.9601
-%%EXAMPLES%%%%EXAMPLESDIR%%/tpwl.acs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Readme
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aoi.W
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aoi.W.tr0
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diffpair.braw
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diffpair.sp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lpf.ac0
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lpf.sp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nand.N.tr0
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nisrc.N.sw0
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pd1.N.tr0
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pd2.N
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quickAC.ac0
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quickINV.tr0
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quickTRAN.tr0
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rcsq.raw
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rcsq.sp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test1.tr0.binary
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlong.tr0.9601
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tpwl.acs
 share/guile/app/gwave/cmds.scm
 share/guile/app/gwave/dynlink.scm
 share/guile/app/gwave/export-gnugraph.scm
@@ -50,5 +50,5 @@
 @dirrm share/guile/app/gwave
 @dirrmtry share/guile/app
 @dirrmtry share/guile
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%