summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2017-01-12 09:01:09 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2017-01-12 09:01:09 +0000
commit4f36d0729d921e20d453098ac815a5de427323d3 (patch)
treec368c2518b00606e70eee366c367477d8125f4e0
parentUpdate to 2.11.8 release. (diff)
- Fix LICENSE
- Add LICENSE_FILE - Switch to options helpers - Regenerate patches
-rw-r--r--graphics/multican/Makefile5
-rw-r--r--graphics/multican/files/patch-usbio.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/graphics/multican/Makefile b/graphics/multican/Makefile
index 3b0fa7969ed9..f671a29958ea 100644
--- a/graphics/multican/Makefile
+++ b/graphics/multican/Makefile
@@ -10,7 +10,8 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Remote control utility for Canon DSLR cameras
-LICENSE= GPLv2
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/COPYING
CFLAGS+= -fPIC # required at least on amd64
USE_LDCONFIG= yes
@@ -19,6 +20,7 @@ PLIST_FILES= bin/multican lib/libmultican.so.0 lib/libmultican.so \
include/canonio.h include/usbio.h
PORTDOCS= ChangeLog README
+
OPTIONS_DEFINE= DOCS
post-patch:
@@ -33,6 +35,7 @@ post-install:
${LN} -sf libmultican.so.0 ${STAGEDIR}${PREFIX}/lib/libmultican.so
${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/graphics/multican/files/patch-usbio.h b/graphics/multican/files/patch-usbio.h
index 08e0e8263ecb..fcc7221ca205 100644
--- a/graphics/multican/files/patch-usbio.h
+++ b/graphics/multican/files/patch-usbio.h
@@ -1,5 +1,5 @@
---- usbio.h.orig 2006-12-18 09:11:04.000000000 +0100
-+++ usbio.h 2009-06-24 10:59:54.000000000 +0200
+--- usbio.h.orig 2007-02-20 14:01:15 UTC
++++ usbio.h
@@ -182,6 +182,8 @@ static struct {
{0x04a9, 0x3113, 6, "EOS 30D"},
{0x04a9, 0x3114, 6, "EOS 30D (ptp)"},