svn commit: r421990 - in head/deskutils/qorganizer: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Tue Sep 13 09:01:33 2016
New Revision: 421990
URL: https://svnweb.freebsd.org/changeset/ports/421990

Log:
  - Add LICENSE
  - Add missing qt dependency
  - Switch to options helpers
  - Regenerate patches with `make makepatch`

Modified:
  head/deskutils/qorganizer/Makefile
  head/deskutils/qorganizer/files/patch-qOrganizer-qt-4.5.0

Modified: head/deskutils/qorganizer/Makefile
==============================================================================
--- head/deskutils/qorganizer/Makefile	Tue Sep 13 08:59:53 2016	(r421989)
+++ head/deskutils/qorganizer/Makefile	Tue Sep 13 09:01:33 2016	(r421990)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qorganizer
 PORTVERSION=	3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/OldFiles
 DISTNAME=	qOrganizer-${PORTVERSION}
@@ -11,23 +11,30 @@ DISTNAME=	qOrganizer-${PORTVERSION}
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	General organizer that includes calendar with jurnal and schedule
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/../COPYING
+
 USES=		qmake
-USE_QT4=	gui network moc_build rcc_build sql
+USE_QT4=	corelib gui network moc_build rcc_build sql
 WRKSRC=		${WRKDIR}/qOrganizer/src
 
 PLIST_FILES=	bin/qOrganizer share/pixmaps/qOrganizer.png
 PORTDOCS=	CHANGELOG.txt COPYING
 
-DESKTOP_ENTRIES=	"qOrganizer" \
-			"${COMMENT}" \
-			"qOrganizer" \
-			"qOrganizer" \
-			"Qt;KDE;Office;" \
-			"true"
+DESKTOP_ENTRIES="qOrganizer" \
+		"${COMMENT}" \
+		"qOrganizer" \
+		"qOrganizer" \
+		"Qt;KDE;Office;" \
+		true
+
+OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qOrganizer ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/../qOrganizer.png ${STAGEDIR}${PREFIX}/share/pixmaps
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/../,} ${STAGEDIR}${DOCSDIR}
 

Modified: head/deskutils/qorganizer/files/patch-qOrganizer-qt-4.5.0
==============================================================================
--- head/deskutils/qorganizer/files/patch-qOrganizer-qt-4.5.0	Tue Sep 13 08:59:53 2016	(r421989)
+++ head/deskutils/qorganizer/files/patch-qOrganizer-qt-4.5.0	Tue Sep 13 09:01:33 2016	(r421990)
@@ -1,5 +1,5 @@
---- qorganizer.cpp.orig	2009-04-06 07:56:17 +0000
-+++ qorganizer.cpp	2009-04-06 07:56:23 +0000
+--- qorganizer.cpp.orig	2007-10-07 06:41:32 UTC
++++ qorganizer.cpp
 @@ -1511,7 +1511,7 @@ void CQTextEdit::insertFromMimeData( con
           QImage *image = new QImage(origin); 
           if(!image->isNull())
@@ -9,8 +9,8 @@
             cursor.insertImage(origin);
            }
           delete image;
---- qorganizer.h.orig	2009-04-06 07:56:12 +0000
-+++ qorganizer.h	2009-04-06 07:56:39 +0000
+--- qorganizer.h.orig	2007-09-07 21:51:40 UTC
++++ qorganizer.h
 @@ -104,6 +104,8 @@ class CQTextEdit:public QTextEdit
   
  };