summaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorDryice Dong Liu <dryice@FreeBSD.org>2008-01-15 03:55:43 +0000
committerDryice Dong Liu <dryice@FreeBSD.org>2008-01-15 03:55:43 +0000
commitb698de5e4cae51c7ad23d2ae706b55bf2be31d3c (patch)
treec67aa2f04e0a0c66e0adb9a3955fd4a5e88ec02b /deskutils
parent- Update to 3.07 (diff)
- use Emacs 22 by default
- update my mail address
Notes
Notes: svn path=/head/; revision=205678
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/planner.el/Makefile17
-rw-r--r--deskutils/planner.el/pkg-plist1
2 files changed, 15 insertions, 3 deletions
diff --git a/deskutils/planner.el/Makefile b/deskutils/planner.el/Makefile
index baee3bc785a1..7504a8e4568a 100644
--- a/deskutils/planner.el/Makefile
+++ b/deskutils/planner.el/Makefile
@@ -14,14 +14,14 @@ MASTER_SITES= http://download.gna.org/planner-el/ \
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= planner-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
-MAINTAINER= dryice@dryice.name
+MAINTAINER= dryice@FreeBSD.org
COMMENT= PlannerMode is an organizer and day planner for Emacs
USE_EMACS= yes
USE_GMAKE= yes
-EMACS_PORT_NAME?= emacs21
+EMACS_PORT_NAME?= emacs22
-.if ${EMACS_PORT_NAME} != "emacs21"
+.if ${EMACS_PORT_NAME} != "emacs22"
PORTNAMESUFFIX= ${PKGNAMESUFFIX}
.endif
@@ -38,6 +38,12 @@ OPTIONS+= XTLA "XTLA support" off
.include <bsd.port.pre.mk>
+.if (${EMACS_PORT_NAME} == "emacs21")
+PLIST_SUB+= HAS_ICAL="@comment "
+.else
+PLIST_SUB+= HAS_ICAL=""
+.endif
+
.if defined(WITH_BBDB)
BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/bbdb/bbdb-com.el:${PORTSDIR}/databases/bbdb
PLIST_SUB+= HAS_BBDB=""
@@ -45,12 +51,17 @@ PLIST_SUB+= HAS_BBDB=""
PLIST_SUB+= HAS_BBDB="@comment "
.endif
+.if (${EMACS_PORT_NAME} == "emacs21")
.if defined(WITH_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
+.else
+# emacs 22 and above has ERC build in
+PLIST_SUB+= HAS_ERC=""
+.endif
.if defined(WITH_GNATS)
BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_SITE_LISPDIR}/gnats.el:${PORTSDIR}/databases/gnats4
diff --git a/deskutils/planner.el/pkg-plist b/deskutils/planner.el/pkg-plist
index fe9a182326af..8ce4f5a2cf1b 100644
--- a/deskutils/planner.el/pkg-plist
+++ b/deskutils/planner.el/pkg-plist
@@ -31,6 +31,7 @@ info/planner-el
%%EMACS_SITE_LISPDIR%%/planner/planner-gnus.el
%%EMACS_SITE_LISPDIR%%/planner/planner-gnus.elc
%%EMACS_SITE_LISPDIR%%/planner/planner-ical.el
+%%HAS_ICAL%%%%EMACS_SITE_LISPDIR%%/planner/planner-ical.elc
%%EMACS_SITE_LISPDIR%%/planner/planner-id.el
%%EMACS_SITE_LISPDIR%%/planner/planner-id.elc
%%EMACS_SITE_LISPDIR%%/planner/planner-ledger.el