diff -ruN --exclude=CVS /usr/ports/cad/geda-gattrib/Makefile /var/tmp/work2/geda-gattrib/Makefile
--- /usr/ports/cad/geda-gattrib/Makefile	Tue Jun 27 02:09:30 2006
+++ /var/tmp/work2/geda-gattrib/Makefile	Thu Jul 13 20:42:57 2006
@@ -7,20 +7,26 @@
 
 PORTNAME=	gattrib
 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/
-DISTNAME=	geda-${PORTNAME}-${PORTVERSION}
+PKGNAMEPREFIX=	geda-
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ssedov@mbsd.msk.ru
-COMMENT=	GEDA's attribute editor
+COMMENT=	The gEDA's attribute editor
 
-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
 
+DATADIR=	${PREFIX}/share/geda
+DOCSDIR=	${PREFIX}/share/doc/geda
+
 GNU_CONFIGURE=	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-gattrib/files/patch-configure /var/tmp/work2/geda-gattrib/files/patch-configure
--- /usr/ports/cad/geda-gattrib/files/patch-configure	Thu Jan  1 03:00:00 1970
+++ /var/tmp/work2/geda-gattrib/files/patch-configure	Thu Jul 13 20:40:41 2006
@@ -0,0 +1,11 @@
+--- configure.orig	Thu Jul 13 20:40:21 2006
++++ configure	Thu Jul 13 20:40:31 2006
+@@ -5384,7 +5384,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-gattrib/pkg-plist /var/tmp/work2/geda-gattrib/pkg-plist
--- /usr/ports/cad/geda-gattrib/pkg-plist	Tue Jun 27 02:09:30 2006
+++ /var/tmp/work2/geda-gattrib/pkg-plist	Thu Jul 13 20:42:14 2006
@@ -1,3 +1,3 @@
 bin/gattrib
-share/gEDA/system-gattribrc
-@dirrmtry share/gEDA
+%%DATADIR%%/system-gattribrc
+@dirrmtry %%DATADIR%%