diff -urN /usr/ports/graphics/gphoto2/Makefile graphics/gphoto2/Makefile
--- /usr/ports/graphics/gphoto2/Makefile	Sat Apr 13 12:54:53 2002
+++ graphics/gphoto2/Makefile	Sat May 11 07:24:30 2002
@@ -7,26 +7,28 @@
 
 PORTNAME=	gphoto2
 PORTVERSION=	2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.gphoto.net/dist/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://www.gphoto.net/dist/
+MASTER_SITE_SUBDIR=	gphoto
 
 MAINTAINER=	ports@FreeBSD.org
 
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext \
 		usb-0.1.5:${PORTSDIR}/devel/libusb \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		exif.5:${PORTSDIR}/graphics/libexif
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
+USE_GLIB=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--without-cdk --without-fig2dev \
-		--with-doc-dir=${DOCSDIR}
+CONFIGURE_ARGS=	--without-cdk --without-fig2dev
 INSTALLS_SHLIB=	yes
 
 MAN1=		gphoto2.1
@@ -39,6 +41,17 @@
 .endfor
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
 		's|\@INSTALL\@|${INSTALL_CMD}|g ; \
-		 s|AUTHORS COPYING README|AUTHORS README|g'
+		 s| install-docDATA||g ; \
+		 s| install-figureDATA||g ; \
+		 s|`glib-config|`\$$\(GLIB_CONFIG\)|g ; \
+		 s|\$$\(libdir\)/pkgconfig|\$$\(prefix\)/libdata/pkgconfig|g'
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in AUTHORS NEWS README doc/FAQ doc/gphoto2-cli.txt doc/gphoto2.txt
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/gphoto2/pkg-plist graphics/gphoto2/pkg-plist
--- /usr/ports/graphics/gphoto2/pkg-plist	Fri Mar  8 19:12:32 2002
+++ graphics/gphoto2/pkg-plist	Fri May 10 21:49:37 2002
@@ -53,15 +53,13 @@
 lib/libgphoto2_port.a
 lib/libgphoto2_port.so
 lib/libgphoto2_port.so.0
-lib/pkgconfig/libgphoto2.pc
-share/doc/gphoto2/AUTHORS
-share/doc/gphoto2/FAQ
-share/doc/gphoto2/NEWS
-share/doc/gphoto2/README
-share/doc/gphoto2/gphoto2-cli.txt
-share/doc/gphoto2/gphoto2.txt
-share/doc/gphoto2/linux-hotplug/usbcam.console
-share/doc/gphoto2/linux-hotplug/usbcam.group
+libdata/pkgconfig/libgphoto2.pc
+%%PORTDOCS%%share/doc/gphoto2/AUTHORS
+%%PORTDOCS%%share/doc/gphoto2/FAQ
+%%PORTDOCS%%share/doc/gphoto2/NEWS
+%%PORTDOCS%%share/doc/gphoto2/README
+%%PORTDOCS%%share/doc/gphoto2/gphoto2-cli.txt
+%%PORTDOCS%%share/doc/gphoto2/gphoto2.txt
 share/gphoto2/konica/english
 share/gphoto2/konica/french
 share/gphoto2/konica/german
@@ -92,10 +90,7 @@
 share/locale/zh_CN/LC_MESSAGES/libgphoto2_port.mo
 @dirrm share/gphoto2/konica
 @dirrm share/gphoto2
-@dirrm share/doc/gphoto2/linux-hotplug
-@dirrm share/doc/gphoto2/html/figures
-@dirrm share/doc/gphoto2/html
-@dirrm share/doc/gphoto2
+%%PORTDOCS%%@dirrm share/doc/gphoto2
 @dirrm lib/gphoto2_port/0.0.4
 @dirrm lib/gphoto2_port
 @dirrm lib/gphoto2/2.0