--- cad/geda/Makefile	2013-09-22 00:47:56.000000000 +0900
+++ cad/geda/Makefile	2013-11-02 00:00:00.000000000 +0900
@@ -2,7 +2,7 @@ 
 # $FreeBSD: head/cad/geda/Makefile 327711 2013-09-20 15:58:41Z bapt $
 
 PORTNAME=	geda
-PORTVERSION=	1.8.1
+PORTVERSION=	1.8.2
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://ftp.geda-project.org/geda-gaf/stable/%SUBDIR%/
@@ -20,8 +20,14 @@ 
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		pathfix gettext perl5 gmake pkgconfig
-USE_GNOME=	desktopfileutils gtk20
+USES=		desktop-file-utils gettext gmake pathfix perl5 pkgconfig \
+		shared-mime-info shebangfix
+SHEBANG_FILES=	examples/lightning_detector/bom libgeda/docs/*.dox \
+		utils/gxyrs/*.pl utils/scripts/* \
+		utils/docs/*.dox gattrib/docs/*.dox \
+		gschem/docs/*.dox gsymcheck/docs/*.dox \
+		gnetlist/docs/*.dox
+USE_GNOME=	gtk20
 USE_PERL5=	run
 USE_PYTHON=	run
 USE_AUTOTOOLS=	libtool
@@ -35,12 +41,6 @@ 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-gaf
 DATADIR=	${PREFIX}/share/gEDA
 
-MAN1=		convert_sym.1 garchive.1 gattrib.1 gmk_sym.1 \
-		gnetlist.1 grenum.1 gsch2pcb.1 gschem.1 \
-		gschlas.1 gsymcheck.1 gsymfix.1 gxyrs.1 \
-		olib.1 pads_backannotate.1 pcb_backannotate.1 refdes_renum.1 \
-		sarlacc_schem.1 sarlacc_sym.1 schdiff.1 smash_megafile.1 \
-		sw2asc.1 tragesym.1
 INFO=		geda-scheme
 
 CONFLICTS=	geda-docs-[0-9]* geda-examples-[0-9]* geda-gattrib-[0-9]* \
@@ -49,13 +49,8 @@ 
 
 PORTSCOUT=	limitw:1,even
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MDOCS)
-CONFIGURE_ARGS+=--docdir=${WRKDIR}/fakeroot
-.endif
-
 post-patch:
 .for dir in gattrib gschem libgeda
 	@${REINPLACE_CMD} -e \
@@ -63,9 +58,5 @@ 
 .endfor
 	@${REINPLACE_CMD} -e \
 		'/OS_LINUX=/s|no|yes|' ${WRKSRC}/configure
-	@${GREP} -lR "/usr/bin/python" ${WRKSRC} | ${XARGS} \
-		${REINPLACE_CMD} -e '/^#!/s|/usr/bin|${LOCALBASE}/bin|'
-	@${GREP} -lR "/usr/bin/perl" ${WRKSRC} | ${XARGS} \
-		${REINPLACE_CMD} -e '/^#!/s|/usr/bin|${LOCALBASE}/bin|'
 
 .include <bsd.port.mk>
--- cad/geda/distinfo	2013-06-21 03:47:03.000000000 +0900
+++ cad/geda/distinfo	2013-11-02 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@ 
-SHA256 (geda-gaf-1.8.1.tar.gz) = 026888ce21cb83a3543a7554de0ddc610cc8dc6ce2341df17c5b3305d6dcbb10
-SIZE (geda-gaf-1.8.1.tar.gz) = 11197244
+SHA256 (geda-gaf-1.8.2.tar.gz) = bbf4773aef1b5a51a8d6f4c3fa288c047340cc62dd6e14d7928fcc6e4051b721
+SIZE (geda-gaf-1.8.2.tar.gz) = 11282353
--- cad/geda/pkg-plist	2013-10-23 00:36:58.000000000 +0900
+++ cad/geda/pkg-plist	2013-11-02 00:00:00.000000000 +0900
@@ -37,6 +37,28 @@ 
 lib/libgeda.so
 lib/libgeda.so.42
 libdata/pkgconfig/libgeda.pc
+man/man1/convert_sym.1.gz
+man/man1/garchive.1.gz
+man/man1/gattrib.1.gz
+man/man1/gmk_sym.1.gz
+man/man1/gnetlist.1.gz
+man/man1/grenum.1.gz
+man/man1/gsch2pcb.1.gz
+man/man1/gschem.1.gz
+man/man1/gschlas.1.gz
+man/man1/gsymcheck.1.gz
+man/man1/gsymfix.1.gz
+man/man1/gxyrs.1.gz
+man/man1/olib.1.gz
+man/man1/pads_backannotate.1.gz
+man/man1/pcb_backannotate.1.gz
+man/man1/refdes_renum.1.gz
+man/man1/sarlacc_schem.1.gz
+man/man1/sarlacc_sym.1.gz
+man/man1/schdiff.1.gz
+man/man1/smash_megafile.1.gz
+man/man1/sw2asc.1.gz
+man/man1/tragesym.1.gz
 share/applications/geda-gattrib.desktop
 share/applications/geda-gschem.desktop
 %%PORTDOCS%%%%DOCSDIR%%/examples/README
@@ -2400,7 +2422,3 @@ 
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/libgeda
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true