3 files changed, 149 insertions, 65 deletions

diff --git a/deskutils/planner.el/Makefile b/deskutils/planner.el/Makefile
index cd34c3fcc150..189a1be8d60a 100644
--- a/deskutils/planner.el/Makefile
+++ b/deskutils/planner.el/Makefile
@@ -6,27 +6,30 @@
 #
 
 PORTNAME=	planner.el
-PORTVERSION=	3.31
+PORTVERSION=	3.40
 CATEGORIES=	deskutils elisp
-MASTER_SITES=	http://sacha.free.net.ph/notebook/emacs/planner/ \
+MASTER_SITES=	http://download.gna.org/planner-el/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	planner-el-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
+DISTNAME=	planner-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	dryice@dryice.name
 COMMENT=	PlannerMode is an organizer and day planner for Emacs
 
 USE_EMACS=	yes
+USE_GMAKE=	yes
 EMACS_PORT_NAME?=	emacs21
 
 .if ${EMACS_PORT_NAME} != "emacs21"
 PORTNAMESUFFIX=	${PKGNAMESUFFIX}
 .endif
 
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emacs-wiki/emacs-wiki.el:${PORTSDIR}/textproc/emacs-wiki
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/muse/muse.el:${PORTSDIR}/textproc/muse
 
 OPTIONS=	BBDB "BBDB support" off
 OPTIONS+=	ERC "ERC support" off
+OPTIONS+=	GNATS "GNATS support" off
+OPTIONS+=	PSVN "PSVN support" off
 OPTIONS+=	VM "View Mail support" off
 OPTIONS+=	W3M "W3M support" off
 OPTIONS+=	WL "Wanderlust support" off
@@ -35,40 +38,79 @@ OPTIONS+=	XTLA "XTLA support" off
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_BBDB)
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/bbdb/bbdb-com.el:${PORTSDIR}/databases/bbdb
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/bbdb/bbdb-com.el:${PORTSDIR}/databases/bbdb
+PLIST_SUB+=	HAS_BBDB=""
+.else
+PLIST_SUB+=	HAS_BBDB="@comment "
 .endif
 
 .if defined(WITH_ERC)
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/erc/erc.el:${PORTSDIR}/irc/erc
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/erc/erc.el:${PORTSDIR}/irc/erc
+PLIST_SUB+=	HAS_ERC=""
+.else
+PLIST_SUB+=	HAS_ERC="@comment "
+.endif
+
+.if defined(WITH_GNATS)
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/gnats.el:${PORTSDIR}/databases/gnats4
+PLIST_SUB+=	HAS_GNATS=""
+.else
+PLIST_SUB+=	HAS_GNATS="@comment "
+.endif
+
+.if defined(WITH_PSVN)
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/psvn/psvn.el:${PORTSDIR}/devel/psvn
+PLIST_SUB+=	HAS_PSVN=""
+.else
+PLIST_SUB+=	HAS_PSVN="@comment "
 .endif
 
 .if defined(WITH_VM)
-RUN_DEPENDS+=	qp-decode:${PORTSDIR}/mail/vm
+BUILD_DEPENDS+=	qp-decode:${PORTSDIR}/mail/vm
+PLIST_SUB+=	HAS_VM=""
+.else
+PLIST_SUB+=	HAS_VM="@comment "
 .endif
 
 .if defined(WITH_W3M)
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/w3m.el:${PORTSDIR}/www/emacs-w3m
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/w3m.el:${PORTSDIR}/www/emacs-w3m
+PLIST_SUB+=	HAS_W3M=""
+.else
+PLIST_SUB+=	HAS_W3M="@comment "
 .endif
 
 .if defined(WITH_WL)
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/wl/wl.el:${PORTSDIR}/mail/wanderlust
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/wl/wl.el:${PORTSDIR}/mail/wanderlust
+PLIST_SUB+=	HAS_WL=""
+.else
+PLIST_SUB+=	HAS_WL="@comment "
 .endif
 
 .if defined(WITH_XTLA)
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/xtla/xtla.el:${PORTSDIR}/devel/xtla
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/xtla/xtla.el:${PORTSDIR}/devel/xtla
+PLIST_SUB+=	HAS_XTLA=""
+.else
+PLIST_SUB+=	HAS_XTLA="@comment "
 .endif
 
-INFO=		planner-el
+RUN_DEPENDS+=	${BUILD_DEPENDS}
+
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/planner
 
-do-build:
-	cd ${WRKSRC}; makeinfo --no-split planner-el.texi
+.if !defined(NOPORTDOCS)
+PORTDOCS=	AUTHORS ChangeLog.2004 ChangeLog.2005 ChangeLog.2006 \
+		COMMENTARY NEWS README
+.endif
+
+pre-build:
+	${CP} ${WRKSRC}/contrib/schedule.el ${WRKSRC}/schedule.el
 
-do-install:
-	${MKDIR} ${LISPDIR}
-.for i in *.el
-	${INSTALL_DATA} ${WRKSRC}/${i} ${LISPDIR}
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	${CP} -R ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/planner-el.info ${PREFIX}/info
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/planner.el/distinfo b/deskutils/planner.el/distinfo
index 6c5f63979faa..78fc0bd45acd 100644
--- a/deskutils/planner.el/distinfo
+++ b/deskutils/planner.el/distinfo
@@ -1,3 +1,3 @@
-MD5 (planner-el-3.31.tar.gz) = 012877bb38c7c60a33551dfb9c60e32e
-SHA256 (planner-el-3.31.tar.gz) = 50fba8fd2f906e34e3f53cf667672df7bbaa785fbb2be69f73af250677b69e38
-SIZE (planner-el-3.31.tar.gz) = 349641
+MD5 (planner-3.40.tar.gz) = ac16b6f70275774668b0dec7ddbf2ea3
+SHA256 (planner-3.40.tar.gz) = 856f5204cdd9ff766a54d1aa80033c5731f5444c5cbb33daababf5842dfe6c8c
+SIZE (planner-3.40.tar.gz) = 351931
diff --git a/deskutils/planner.el/pkg-plist b/deskutils/planner.el/pkg-plist
index cd490135f787..5b77f785dc3d 100644
--- a/deskutils/planner.el/pkg-plist
+++ b/deskutils/planner.el/pkg-plist
@@ -1,44 +1,86 @@
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-accomplishments.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-appt.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-authz.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-auto.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-bbdb.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-bibtex.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-bookmark.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-calendar.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-cyclic.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-deadline.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-diary.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-erc.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-experimental.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-export-diary.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-gnats.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-gnus.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-ical.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-id.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-ledger.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-lisp.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-log-edit.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-mhe.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-multi.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-notes-index.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-psvn.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-rank.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-rdf.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-report.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-rmail.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-rss.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-schedule.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-tasks-overview.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-timeclock-summary-proj.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-timeclock-summary.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-timeclock.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-trunk.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-unix-mail.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-vm.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-w3m.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-wl.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner-xtla.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/planner.el
-%%EMACS_VERSION_SITE_LISPDIR%%/planner/schedule.el
-@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/planner
+info/planner-el
+%%EMACS_SITE_LISPDIR%%/planner/planner-accomplishments.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-accomplishments.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-appt.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-appt.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-authz.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-authz.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-autoloads.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-bbdb.el
+%%HAS_BBDB%%%%EMACS_SITE_LISPDIR%%/planner/planner-bbdb.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-bibtex.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-bibtex.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-bookmark.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-bookmark.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-calendar.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-calendar.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-cyclic.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-cyclic.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-deadline.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-deadline.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-diary.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-diary.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-erc.el
+%%HAS_ERC%%%%EMACS_SITE_LISPDIR%%/planner/planner-erc.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-experimental.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-experimental.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-export-diary.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-export-diary.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-gnats.el
+%%HAS_GNATS%%%%EMACS_SITE_LISPDIR%%/planner/planner-gnats.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-gnus.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-gnus.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-ical.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-id.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-id.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-ledger.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-lisp.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-lisp.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-log-edit.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-log-edit.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-mhe.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-multi.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-multi.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-notes-index.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-notes-index.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-psvn.el
+%%HAS_PSVN%%%%EMACS_SITE_LISPDIR%%/planner/planner-psvn.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-publish.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-publish.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-rank.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-rank.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-rdf.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-rdf.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-report.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-report.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-rmail.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-rmail.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-rss.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-rss.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-schedule.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-schedule.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-tasks-overview.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-tasks-overview.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-timeclock-summary-proj.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-timeclock-summary-proj.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-timeclock-summary.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-timeclock-summary.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-timeclock.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-timeclock.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-trunk.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-trunk.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-unix-mail.el
+%%EMACS_SITE_LISPDIR%%/planner/planner-unix-mail.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-vm.el
+%%HAS_VM%%%%EMACS_SITE_LISPDIR%%/planner/planner-vm.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-w3m.el
+%%HAS_W3M%%%%EMACS_SITE_LISPDIR%%/planner/planner-w3m.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-wl.el
+%%HAS_WL%%%%EMACS_SITE_LISPDIR%%/planner/planner-wl.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner-xtla.el
+%%HAS_XTLA%%%%EMACS_SITE_LISPDIR%%/planner/planner-xtla.elc
+%%EMACS_SITE_LISPDIR%%/planner/planner.el
+%%EMACS_SITE_LISPDIR%%/planner/planner.elc
+%%EMACS_SITE_LISPDIR%%/planner/schedule.el
+%%EMACS_SITE_LISPDIR%%/planner/schedule.elc
+@dirrm %%EMACS_SITE_LISPDIR%%/planner