3 files changed, 34 insertions, 33 deletions

diff --git a/deskutils/remember.el/Makefile b/deskutils/remember.el/Makefile
index f285e9ea7e35..888f7f19a927 100644
--- a/deskutils/remember.el/Makefile
+++ b/deskutils/remember.el/Makefile
@@ -6,47 +6,41 @@
 #
 
 PORTNAME=	remember.el
-PORTVERSION=	1.8
+PORTVERSION=	1.9
 CATEGORIES=	deskutils elisp
-MASTER_SITES=	http://sacha.free.net.ph/notebook/emacs/planner/ \
+MASTER_SITES=	http://download.gna.org/remember-el/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	remember-el-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
+DISTNAME=	remember-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	dryice@dryice.name
 COMMENT=	A Emacs mode for remembering data
 
 USE_EMACS=	yes
+USE_GMAKE=	yes
 EMACS_PORT_NAME?=	emacs21
 
-.if ${EMACS_PORT_NAME} != "emacs21"
-PORTNAMESUFFIX=	${PKGNAMESUFFIX}
-.endif
-
 OPTIONS=	BBDB "BBDB support" on
 OPTIONS+=	PLANNER "Planner.el support" on
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_BBDB)
+.if ${EMACS_NAME} == "xemacs"
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/xemacs-packages/lisp/bbdb/bbdb-com.el:${PORTSDIR}/editors/xemacs-packages
+.else
 RUN_DEPENDS+=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/bbdb/bbdb-com.el:${PORTSDIR}/databases/bbdb
 .endif
+PLIST_SUB+=	HAS_BBDB=""
+.else
+PLIST_SUB+=	HAS_BBDB="@comment "
+.endif
 
 .if !defined(WITHOUT_PLANNER)
 RUN_DEPENDS+=	${PREFIX}/${EMACS_SITE_LISPDIR}/planner/planner.el:${PORTSDIR}/deskutils/planner.el
+PLIST_SUB+=	HAS_PLANNER=""
+.else
+PLIST_SUB+=	HAS_PLANNER="@comment "
 .endif
 
-INFO=		remember-el
-LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/remember
-
-do-build:
-	cd ${WRKSRC}; makeinfo --no-split remember.texi
-
-do-install:
-	${MKDIR} ${LISPDIR}
-.for i in *.el
-	${INSTALL_DATA} ${WRKSRC}/${i} ${LISPDIR}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/remember-el.info ${PREFIX}/info
-
 .include <bsd.port.post.mk>
diff --git a/deskutils/remember.el/distinfo b/deskutils/remember.el/distinfo
index 86713219c972..02f7341c6823 100644
--- a/deskutils/remember.el/distinfo
+++ b/deskutils/remember.el/distinfo
@@ -1,3 +1,3 @@
-MD5 (remember-el-1.8.tar.gz) = eb39c4a319deeffdd1e150592abc8f9a
-SHA256 (remember-el-1.8.tar.gz) = d4c1e73d227f58db7ea003ec4a4176d2b763366e18989e03dfdba46d7974e0e5
-SIZE (remember-el-1.8.tar.gz) = 36014
+MD5 (remember-1.9.tar.gz) = 1de06197374deff41d5c756e5f25ced9
+SHA256 (remember-1.9.tar.gz) = 64ac85177414f88597e2cae8bf7b7ae3a3fe68a5543f2ba329865da166bf9e83
+SIZE (remember-1.9.tar.gz) = 41293
diff --git a/deskutils/remember.el/pkg-plist b/deskutils/remember.el/pkg-plist
index 1e8a501b4191..cf081f6fa1bc 100644
--- a/deskutils/remember.el/pkg-plist
+++ b/deskutils/remember.el/pkg-plist
@@ -1,10 +1,17 @@
-%%EMACS_VERSION_SITE_LISPDIR%%/remember/read-file-name.el
-%%EMACS_VERSION_SITE_LISPDIR%%/remember/remember-bbdb.el
-%%EMACS_VERSION_SITE_LISPDIR%%/remember/remember-bibl.el
-%%EMACS_VERSION_SITE_LISPDIR%%/remember/remember-blosxom.el
-%%EMACS_VERSION_SITE_LISPDIR%%/remember/remember-diary.el
-%%EMACS_VERSION_SITE_LISPDIR%%/remember/remember-emacs-wiki-journal.el
-%%EMACS_VERSION_SITE_LISPDIR%%/remember/remember-experimental.el
-%%EMACS_VERSION_SITE_LISPDIR%%/remember/remember-planner.el
-%%EMACS_VERSION_SITE_LISPDIR%%/remember/remember.el
-@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/remember
+%%EMACS_SITE_LISPDIR%%/remember/read-file-name.el
+%%EMACS_SITE_LISPDIR%%/remember/read-file-name.elc
+%%EMACS_SITE_LISPDIR%%/remember/remember-autoloads.el
+%%EMACS_SITE_LISPDIR%%/remember/remember-bbdb.el
+%%HAS_BBDB%%%%EMACS_SITE_LISPDIR%%/remember/remember-bbdb.elc
+%%EMACS_SITE_LISPDIR%%/remember/remember-bibl.el
+%%EMACS_SITE_LISPDIR%%/remember/remember-blosxom.el
+%%EMACS_SITE_LISPDIR%%/remember/remember-diary.el
+%%EMACS_SITE_LISPDIR%%/remember/remember-diary.elc
+%%EMACS_SITE_LISPDIR%%/remember/remember-emacs-wiki-journal.el
+%%EMACS_SITE_LISPDIR%%/remember/remember-experimental.el
+%%EMACS_SITE_LISPDIR%%/remember/remember-experimental.elc
+%%EMACS_SITE_LISPDIR%%/remember/remember-planner.el
+%%HAS_PLANNER%%%%EMACS_SITE_LISPDIR%%/remember/remember-planner.elc
+%%EMACS_SITE_LISPDIR%%/remember/remember.el
+%%EMACS_SITE_LISPDIR%%/remember/remember.elc
+@dirrm %%EMACS_SITE_LISPDIR%%/remember