diff -ruN --exclude=CVS /usr/ports/cad/geda-utils/Makefile /var/tmp/work2/geda-utils/Makefile
--- /usr/ports/cad/geda-utils/Makefile	Wed Jun 28 11:51:26 2006
+++ /var/tmp/work2/geda-utils/Makefile	Thu Jul 13 20:17:40 2006
@@ -5,22 +5,29 @@
 # $FreeBSD: ports/cad/geda-utils/Makefile,v 1.12 2006/06/28 07:51:26 pav Exp $
 #
 
-PORTNAME=	geda-utils
+PORTNAME=	utils
 PORTVERSION=	20060123
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
 		http://www.tinkerbox.org/projects/files/gEDA/
+PKGNAMEPREFIX=	geda-
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ssedov@mbsd.msk.ru
-COMMENT=	gEDA utilities
+COMMENT=	The gEDA's utilities
 
-RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
+RUN_DEPENDS=	${LOCALBASE}/share/geda/sym:${PORTSDIR}/cad/geda-symbols
 LIB_DEPENDS=	geda.25:${PORTSDIR}/cad/libgeda
 
+DOCSDIR=	${PREFIX}/share/doc/geda
+DATADIR=	${PREFIX}/share/geda
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff -ruN --exclude=CVS /usr/ports/cad/geda-utils/files/patch-configure /var/tmp/work2/geda-utils/files/patch-configure
--- /usr/ports/cad/geda-utils/files/patch-configure	Thu Jan  1 03:00:00 1970
+++ /var/tmp/work2/geda-utils/files/patch-configure	Thu Jul 13 19:59:42 2006
@@ -0,0 +1,11 @@
+--- configure.orig	Thu Jul 13 19:58:56 2006
++++ configure	Thu Jul 13 19:59:21 2006
+@@ -5859,7 +5859,7 @@
+ # gEDA/gaf specify setup start
+ #
+ 
+-DATADIR=gEDA
++DATADIR=geda
+ GEDADATADIR=$datadir/$DATADIR
+ 
+ if eval "test x$opt_rcdir = x"; then
diff -ruN --exclude=CVS /usr/ports/cad/geda-utils/pkg-descr /var/tmp/work2/geda-utils/pkg-descr
--- /usr/ports/cad/geda-utils/pkg-descr	Thu Oct 10 22:38:37 2002
+++ /var/tmp/work2/geda-utils/pkg-descr	Thu Jul 13 20:21:13 2006
@@ -1,3 +1,3 @@
-gEDA utilties - gschupdate, gsymupdate
+Various supplementary utilities for gEDA system.
 
 WWW: http://www.geda.seul.org
diff -ruN --exclude=CVS /usr/ports/cad/geda-utils/pkg-plist /var/tmp/work2/geda-utils/pkg-plist
--- /usr/ports/cad/geda-utils/pkg-plist	Tue Jun 27 02:06:27 2006
+++ /var/tmp/work2/geda-utils/pkg-plist	Thu Jul 13 20:20:16 2006
@@ -1,6 +1,6 @@
-bin/gmk_sym
 bin/convert_sym
 bin/garchive
+bin/gmk_sym
 bin/grenum
 bin/gsch2pcb
 bin/gschemdoc
@@ -15,11 +15,11 @@
 bin/sarlacc_sym
 bin/smash_megafile
 bin/tragesym
-share/doc/geda-doc/readmes/README.grenum
-share/doc/geda-doc/readmes/README.gsch2pcb
-share/doc/geda-doc/readmes/README.olib
-share/doc/geda-doc/readmes/README.tragesym
-share/gEDA/system-gschlasrc
-@dirrmtry share/gEDA
-@dirrmtry share/doc/geda-doc/readmes
-@dirrmtry share/doc/geda-doc
+%%DOCSDIR%%/readmes/README.grenum
+%%DOCSDIR%%/readmes/README.gsch2pcb
+%%DOCSDIR%%/readmes/README.olib
+%%DOCSDIR%%/readmes/README.tragesym
+%%DATADIR%%/system-gschlasrc
+@dirrmtry %%DATADIR%%
+@dirrmtry %%DOCSDIR%%/readmes
+@dirrmtry %%DOCSDIR%%