5 files changed, 34 insertions, 26 deletions

diff --git a/deskutils/remember.el/Makefile b/deskutils/remember.el/Makefile
index d29efaa1e484..4a699b486ff4 100644
--- a/deskutils/remember.el/Makefile
+++ b/deskutils/remember.el/Makefile
@@ -6,37 +6,30 @@
 #
 
 PORTNAME=	remember.el
-PORTVERSION=	1.9
-PORTREVISION=	3
+PORTVERSION=	2.0
 CATEGORIES=	deskutils elisp
-MASTER_SITES=	http://download.gna.org/remember-el/ \
-		http://dryice.name/computer/FreeBSD/distfiles/
+MASTER_SITES=	http://download.gna.org/remember-el/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	remember-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	dryice@dryice.name
 COMMENT=	A Emacs mode for remembering data
 
-BROKEN=		Conflicting dependencies
-DEPRECATED=	has been broken for more than 6 months
-EXPIRATION_DATE=2009-01-19
-
 USE_EMACS=	yes
 USE_GMAKE=	yes
-EMACS_PORT_NAME?=	emacs21
 
-INFO=		remember-el
+INFO=		remember remember-extra
 
-OPTIONS=	BBDB "BBDB support" on
-OPTIONS+=	PLANNER "Planner.el support" on
+OPTIONS=	BBDB "BBDB support" off
+OPTIONS+=	PLANNER "Planner.el support" off
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_BBDB)
 .if ${EMACS_NAME} == "xemacs"
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/xemacs-packages/lisp/bbdb/bbdb-com.el:${PORTSDIR}/editors/xemacs-packages
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/bbdb/bbdb-com.el:${PORTSDIR}/editors/xemacs-packages
 .else
-BUILD_DEPENDS+=	${PREFIX}/${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
 .endif
 PLIST_SUB+=	HAS_BBDB=""
 .else
@@ -44,11 +37,11 @@ PLIST_SUB+=	HAS_BBDB="@comment "
 .endif
 
 .if !defined(WITHOUT_PLANNER)
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_SITE_LISPDIR}/planner/planner.el:${PORTSDIR}/deskutils/planner.el
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/planner/planner.el:${PORTSDIR}/deskutils/planner.el
 PLIST_SUB+=	HAS_PLANNER=""
 .else
 PLIST_SUB+=	HAS_PLANNER="@comment "
 .endif
-RUN_DEPENDS+= ${BUILD_DEPENDS}
+RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/remember.el/distinfo b/deskutils/remember.el/distinfo
index 02f7341c6823..f93c1fb4cd0a 100644
--- a/deskutils/remember.el/distinfo
+++ b/deskutils/remember.el/distinfo
@@ -1,3 +1,3 @@
-MD5 (remember-1.9.tar.gz) = 1de06197374deff41d5c756e5f25ced9
-SHA256 (remember-1.9.tar.gz) = 64ac85177414f88597e2cae8bf7b7ae3a3fe68a5543f2ba329865da166bf9e83
-SIZE (remember-1.9.tar.gz) = 41293
+MD5 (remember-2.0.tar.gz) = 7b5fac511a3546d417ec09a72ead49e3
+SHA256 (remember-2.0.tar.gz) = 95a7a69e6418d8cb9a5edd65b38f40a2bf3c81fa8c5f79f5aa662dd9c3017711
+SIZE (remember-2.0.tar.gz) = 48096
diff --git a/deskutils/remember.el/files/patch-Makefile b/deskutils/remember.el/files/patch-Makefile
index 974a12aa15a6..ba1b62378bd4 100644
--- a/deskutils/remember.el/files/patch-Makefile
+++ b/deskutils/remember.el/files/patch-Makefile
@@ -1,13 +1,15 @@
---- Makefile.orig	Sat Sep  9 12:36:41 2006
-+++ Makefile	Sat Sep  9 12:36:49 2006
-@@ -42,8 +42,8 @@
+--- Makefile.orig	2008-04-17 09:43:47.000000000 +0530
++++ Makefile	2008-12-26 23:15:14.000000000 +0530
+@@ -45,10 +45,8 @@
  	install -m 0644 $(PROJECT)-autoloads.el $(EL) $(wildcard *.elc) \
  	    $(ELISPDIR)
  	[ -d $(INFODIR) ] || install -d $(INFODIR)
 -	install -m 0644 $(MANUAL).info $(INFODIR)/$(MANUAL)
+-	install -m 0644 $(MANUAL)-extra.info $(INFODIR)/$(MANUAL)-extra
 -	$(INSTALLINFO) $(INFODIR)/$(MANUAL)
-+	install -m 0644 $(MANUAL).info $(INFODIR)/$(MANUAL).info
-+	$(INSTALLINFO) $(INFODIR)/$(MANUAL).info
+-	$(INSTALLINFO) $(INFODIR)/$(MANUAL)-extra
++	install -m 0644 $(MANUAL).info $(INFODIR)
++	install -m 0644 $(MANUAL)-extra.info $(INFODIR)
  
  test: $(ELC)
  	$(EMACS) -q $(SITEFLAG) -batch -l ./scripts/$(PROJECT)-build.el \
diff --git a/deskutils/remember.el/files/patch-Makefile.defs b/deskutils/remember.el/files/patch-Makefile.defs
new file mode 100644
index 000000000000..8603a9d914f3
--- /dev/null
+++ b/deskutils/remember.el/files/patch-Makefile.defs
@@ -0,0 +1,15 @@
+--- Makefile.defs--	2008-12-26 22:58:25.000000000 +0530
++++ Makefile.defs	2008-12-26 22:59:01.000000000 +0530
+@@ -8,9 +8,9 @@
+ 
+ # Installation options
+ # PREFIX is only used here.
+-PREFIX   = /usr/local
+-ELISPDIR = $(PREFIX)/share/emacs/site-lisp/remember
+-INFODIR  = $(PREFIX)/info
++PREFIX   ?= /usr/local
++ELISPDIR ?= $(PREFIX)/share/emacs/site-lisp/remember
++INFODIR  ?= $(PREFIX)/info
+ 
+ # Command to use to install the Info dir entry
+ INSTALLINFO = install-info --info-dir=$(INFODIR)
diff --git a/deskutils/remember.el/pkg-plist b/deskutils/remember.el/pkg-plist
index 8875caa90d0e..e7dbb68c07ea 100644
--- a/deskutils/remember.el/pkg-plist
+++ b/deskutils/remember.el/pkg-plist
@@ -5,8 +5,6 @@
 %%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
 %%HAS_PLANNER%%%%EMACS_SITE_LISPDIR%%/remember/remember-experimental.elc