Index: head/graphics/gphoto2/Makefile
===================================================================
--- head/graphics/gphoto2/Makefile	(revision 393144)
+++ head/graphics/gphoto2/Makefile	(revision 393145)
@@ -1,42 +1,41 @@
 # Created by: Anders Nordby <anders@fix.no>
 # $FreeBSD$
 
 PORTNAME=	gphoto2
 PORTVERSION=	2.5.8
 CATEGORIES=	graphics
 MASTER_SITES=	SF/gphoto/gphoto/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line frontend to libgphoto2
 
 LICENSE=	GPLv2
-#LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
 		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 
 USES=		gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	POPT_CFLAGS="$$(pkg-config --cflags popt)" \
 		POPT_LIBS="$$(pkg-config --libs popt)" \
 		ac_cv_lib_pthread_pthread_exit=no
 CONFIGURE_ARGS=	--without-cdk
 
 OPTIONS_DEFINE=		AALIB DOCS NLS READLINE
 OPTIONS_DEFAULT=	AALIB READLINE
 OPTIONS_SUB=		yes
 
 AALIB_DESC=		Text mode capture preview support
 AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
 AALIB_CONFIGURE_WITH=	aalib
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LDFLAGS=		-L${LOCALBASE}/lib -lintl
 READLINE_USES=		readline
 READLINE_CONFIGURE_WITH=readline
 
 post-install:
-	(cd ${WRKSRC} && ${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/libgphoto2/Makefile
===================================================================
--- head/graphics/libgphoto2/Makefile	(revision 393144)
+++ head/graphics/libgphoto2/Makefile	(revision 393145)
@@ -1,73 +1,72 @@
 # Created by: Anders Nordby <anders@fix.no>
 # $FreeBSD$
 
 PORTNAME=	libgphoto2
 PORTVERSION=	2.5.8
 CATEGORIES=	graphics
 MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Universal digital camera control library
 
 LICENSE=	LGPL21
-#LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
 USES=		gmake iconv libtool pkgconfig tar:bzip2
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
 		LIBLTDL="-L${LOCALBASE}/lib -lltdl" \
 		PATH="${PATH:C,${HOME}/bin,,}" \
 		ac_cv_path_DOT=false \
 		ac_cv_path_DOXYGEN=false \
 		udevscriptdir=${WRKDIR}
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.12.0
 
 OPTIONS_DEFINE=		DOCS GD JPEG LIBEXIF NLS XML
 OPTIONS_DEFAULT=	GD JPEG LIBEXIF XML
 OPTIONS_SUB=		yes
 
 GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
 GD_CONFIGURE_WITH=	gd
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	jpeg
 LIBEXIF_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
 LIBEXIF_CONFIGURE_OFF=	--with-libexif=no
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 XML_USE=		GNOME=libxml2
 XML_CONFIGURE_WITH=	libxml2
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000040
 CONFIGURE_ENV+=	LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
 .endif
 
 post-patch:
 .for i in configure libgphoto2_port/configure
 	@${REINPLACE_CMD} -e \
 		'/FLAGS/s|-g|| ; \
 		 /grep -i linux/s|; fi ; then|; else false; fi ; then| ; \
 		 /pkgconfig/s|$${libdir}|$${prefix}/libdata|' \
 		${WRKSRC}/${i}
 .endfor
 	@${REINPLACE_CMD} -e \
 		'/^doc_DATA/s|COPYING||' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|-lusb-1.0|-lusb|' \
 		${WRKSRC}/libgphoto2_port/configure
 	@${REINPLACE_CMD} -e \
 		'/^SUBDIRS/s|linux-hotplug||' \
 		${WRKSRC}/packaging/Makefile.in
 
 .include <bsd.port.mk>