diff options
| author | Dryice Dong Liu <dryice@FreeBSD.org> | 2008-01-15 03:55:43 +0000 |
|---|---|---|
| committer | Dryice Dong Liu <dryice@FreeBSD.org> | 2008-01-15 03:55:43 +0000 |
| commit | b698de5e4cae51c7ad23d2ae706b55bf2be31d3c (patch) | |
| tree | c67aa2f04e0a0c66e0adb9a3955fd4a5e88ec02b | |
| parent | 6abaf56dfeee957dd7a54100c60bd17d15c4d6d3 (diff) | |
Notes
| -rw-r--r-- | deskutils/planner.el/Makefile | 17 | ||||
| -rw-r--r-- | deskutils/planner.el/pkg-plist | 1 | ||||
| -rw-r--r-- | devel/xtla/Makefile | 6 | ||||
| -rw-r--r-- | editors/tree-widget/Makefile | 6 | ||||
| -rw-r--r-- | textproc/dictionary/Makefile | 4 |
5 files changed, 23 insertions, 11 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 diff --git a/devel/xtla/Makefile b/devel/xtla/Makefile index fc4db87c906d..615615dbe561 100644 --- a/devel/xtla/Makefile +++ b/devel/xtla/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://download.gna.org/xtla-el/ \ http://dryice.name/computer/FreeBSD/distfiles/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} -MAINTAINER= dryice@dryice.name +MAINTAINER= dryice@FreeBSD.org COMMENT= An Emacs front-end to tla BUILD_DEPENDS+= tla:${PORTSDIR}/devel/tla \ @@ -22,9 +22,9 @@ BUILD_DEPENDS+= tla:${PORTSDIR}/devel/tla \ RUN_DEPENDS= ${BUILD_DEPENDS} USE_EMACS= yes -EMACS_PORT_NAME?= emacs21 +EMACS_PORT_NAME?= emacs22 -.if ${EMACS_PORT_NAME} != "emacs21" +.if ${EMACS_PORT_NAME} != "emacs22" PORTNAMESUFFIX= ${PKGNAMESUFFIX} .endif diff --git a/editors/tree-widget/Makefile b/editors/tree-widget/Makefile index 09d92f572c35..cf09f7b05a6c 100644 --- a/editors/tree-widget/Makefile +++ b/editors/tree-widget/Makefile @@ -14,13 +14,13 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ MASTER_SITE_SUBDIR= emhacks PKGNAMESUFFIX= -${EMACS_PORT_NAME} -MAINTAINER= dryice@dryice.name +MAINTAINER= dryice@FreeBSD.org COMMENT= A tree widget for Emacs USE_EMACS= yes -EMACS_PORT_NAME?= emacs21 +EMACS_PORT_NAME?= emacs22 -.if ${EMACS_PORT_NAME} != "emacs21" +.if ${EMACS_PORT_NAME} != "emacs22" PORTNAMESUFFIX= ${PKGNAMESUFFIX} .endif diff --git a/textproc/dictionary/Makefile b/textproc/dictionary/Makefile index ad504af85105..1044b4d8043d 100644 --- a/textproc/dictionary/Makefile +++ b/textproc/dictionary/Makefile @@ -13,11 +13,11 @@ MASTER_SITES= http://me.in-berlin.de/~myrkr/dictionary/ \ http://bsdchat.com/dist/dryice/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} -MAINTAINER= dryice@dryice.name +MAINTAINER= dryice@FreeBSD.org COMMENT= A dictionary client for Emacs USE_EMACS= yes -EMACS_PORT_NAME?= emacs21 +EMACS_PORT_NAME?= emacs22 LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} ELS= connection.el dictionary.el link.el |