aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--textproc/Makefile1
-rw-r--r--textproc/dictem-emacs22/Makefile12
-rw-r--r--textproc/dictem/Makefile6
4 files changed, 2 insertions, 18 deletions
diff --git a/MOVED b/MOVED
index f7a23124e5fb..b4a307661f1c 100644
--- a/MOVED
+++ b/MOVED
@@ -3528,3 +3528,4 @@ editors/openoffice.org-1.1-devel||2008-07-02|Removed
deskutils/gdeskcal||2008-07-03|Disappeared from master site
deskutils/gdeskcal-skins||2008-07-03|Disappeared from master site
deskutils/gnome-menu-editor||2008-07-03|Disappeared from master site and take over by alacarte
+textproc/dictum-emacs22||2008-07-05|Assimilated into textproc/dictum
diff --git a/textproc/Makefile b/textproc/Makefile
index 1879dcc13970..617ec622e1ac 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -81,7 +81,6 @@
SUBDIR += denature
SUBDIR += dict
SUBDIR += dictem
- SUBDIR += dictem-emacs22
SUBDIR += dictem-xemacs21-mule
SUBDIR += dictfmt
SUBDIR += dictionary
diff --git a/textproc/dictem-emacs22/Makefile b/textproc/dictem-emacs22/Makefile
deleted file mode 100644
index 75971ec4d60c..000000000000
--- a/textproc/dictem-emacs22/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# New ports collection makefile for: dictem
-# Date created: 1 Mar 2007
-# Whom: Max N. Boyarov <m.boyarov@bsd.by>
-#
-# $FreeBSD$
-#
-
-MASTERDIR= ${.CURDIR}/../dictem
-
-EMACS_PORT_NAME= emacs22
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/dictem/Makefile b/textproc/dictem/Makefile
index 68fd0eafe3ef..c13695f991fc 100644
--- a/textproc/dictem/Makefile
+++ b/textproc/dictem/Makefile
@@ -6,7 +6,7 @@
PORTNAME= dictem
PORTVERSION= 0.81
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc net elisp
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,10 +15,6 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= m.boyarov@bsd.by
COMMENT= DictEm is a dict client for [X]Emacs
-USE_EMACS= yes
-
-EMACS_PORT_NAME?=emacs21
-
.if ${EMACS_PORT_NAME} != "emacs21"
PORTNAMESUFFIX= ${PKGNAMESUFFIX}
.endif