- Fix LICENSE

- Add LICENSE_FILE
- Switch to options helpers
- Regenerate patches

6 files changed, 25 insertions, 21 deletions

diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile
index edd7af781ead..65446dab484d 100644
--- a/graphics/flphoto/Makefile
+++ b/graphics/flphoto/Makefile
@@ -11,7 +11,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Basic image management and display program
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2 \
 		libfltk.so:x11-toolkits/fltk \
@@ -22,6 +23,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		tar:bzip2
 USE_XORG=	xinerama
 GNU_CONFIGURE=	yes
+
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
@@ -29,17 +31,19 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/flphoto ${STAGEDIR}${PREFIX}/bin/flphoto
-	${INSTALL_MAN} ${WRKSRC}/doc/flphoto.man ${STAGEDIR}${MANPREFIX}/man/man1/flphoto.1
+	${INSTALL_MAN} ${WRKSRC}/doc/flphoto.man ${STAGEDIR}${MAN1PREFIX}/man/man1/flphoto.1
 	${INSTALL_MAN} ${WRKSRC}/doc/album.man ${STAGEDIR}${MAN5PREFIX}/man/man5/album.5
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.jpg ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${STAGEDIR}${DOCSDIR}
 .for lang in de en_CA en_GB es fr it nl pt
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}
 	${INSTALL_DATA} ${WRKSRC}/po/${lang}.po \
 		${STAGEDIR}${PREFIX}/share/locale/${lang}/flphoto_${lang}
 .endfor
 
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.jpg ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/graphics/flphoto/files/patch-Fl_Print_Dialog2.cxx b/graphics/flphoto/files/patch-Fl_Print_Dialog2.cxx
index 39d70a733107..e8d45e840bfe 100644
--- a/graphics/flphoto/files/patch-Fl_Print_Dialog2.cxx
+++ b/graphics/flphoto/files/patch-Fl_Print_Dialog2.cxx
@@ -1,5 +1,5 @@
---- ./Fl_Print_Dialog2.cxx.orig	2006-11-26 22:45:08.000000000 +0100
-+++ ./Fl_Print_Dialog2.cxx	2012-12-22 12:41:39.000000000 +0100
+--- Fl_Print_Dialog2.cxx.orig	2006-11-26 21:45:08 UTC
++++ Fl_Print_Dialog2.cxx
 @@ -56,6 +56,7 @@
  
  #ifdef HAVE_LIBCUPS
diff --git a/graphics/flphoto/files/patch-camera.cxx b/graphics/flphoto/files/patch-camera.cxx
index 14be5750a069..04221955b4bc 100644
--- a/graphics/flphoto/files/patch-camera.cxx
+++ b/graphics/flphoto/files/patch-camera.cxx
@@ -1,5 +1,5 @@
---- camera.cxx.orig	2008-09-15 21:32:33.000000000 +0800
-+++ camera.cxx	2008-09-15 21:33:49.000000000 +0800
+--- camera.cxx.orig	2006-07-18 01:11:22 UTC
++++ camera.cxx
 @@ -42,6 +42,7 @@
  #  define fl_mkdir(p)	mkdir(p)
  #else
@@ -18,7 +18,7 @@
  static void	progress_update(GPContext *context, unsigned id, float current,
  		                void *data);
  static void	purge_thumbnails(void);
-@@ -909,7 +909,6 @@
+@@ -909,7 +909,6 @@ static unsigned				// O - ID number
  progress_start(GPContext  *context,	// I - Current context
                 float      target,	// I - Target size
  	       const char *format,	// I - Progress text, if any
diff --git a/graphics/flphoto/files/patch-espmsg.c b/graphics/flphoto/files/patch-espmsg.c
index 6c3d8a1af172..4e553e49c1e6 100644
--- a/graphics/flphoto/files/patch-espmsg.c
+++ b/graphics/flphoto/files/patch-espmsg.c
@@ -1,6 +1,6 @@
---- ./espmsg.c.orig	2005-01-23 04:52:44.000000000 +0100
-+++ ./espmsg.c	2012-12-22 12:41:39.000000000 +0100
-@@ -766,7 +766,7 @@
+--- espmsg.c.orig	2005-01-23 03:52:44 UTC
++++ espmsg.c
+@@ -766,7 +766,7 @@ translate_messages(const char *language)
      *bufptr++ = '&';
      *bufptr = '\0';
  
diff --git a/graphics/flphoto/files/patch-http-md5.cxx b/graphics/flphoto/files/patch-http-md5.cxx
index c11fc62e6f1b..f615ef88724b 100644
--- a/graphics/flphoto/files/patch-http-md5.cxx
+++ b/graphics/flphoto/files/patch-http-md5.cxx
@@ -1,6 +1,6 @@
---- ./http-md5.cxx.orig	2012-12-22 12:42:25.000000000 +0100
-+++ ./http-md5.cxx	2012-12-22 12:42:28.000000000 +0100
-@@ -120,7 +120,7 @@
+--- http-md5.cxx.orig	2005-01-23 03:52:44 UTC
++++ http-md5.cxx
+@@ -120,7 +120,7 @@ HTTP::md5_string(const MD5Byte *sum,		/*
  {
    int		i;				/* Looping var */
    char		*md5ptr;			/* Pointer into MD5 string */
diff --git a/graphics/flphoto/files/patch-image.cxx b/graphics/flphoto/files/patch-image.cxx
index ad2b8d472e83..939f7e601ae2 100644
--- a/graphics/flphoto/files/patch-image.cxx
+++ b/graphics/flphoto/files/patch-image.cxx
@@ -1,6 +1,6 @@
---- image.cxx.orig	2006-11-18 14:56:11.000000000 +0100
-+++ image.cxx	2012-05-09 12:28:28.000000000 +0200
-@@ -92,6 +92,7 @@
+--- image.cxx.orig	2006-11-18 13:56:11 UTC
++++ image.cxx
+@@ -92,6 +92,7 @@ extern "C" {
  
  #ifdef HAVE_LIBPNG
  #  include <png.h>