Remove comments and optional dependencies for ports which are

about to be removed.

12 files changed, 4 insertions, 51 deletions

diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index f54712ea1b9c..17f6a910aad2 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -36,7 +36,6 @@ CONFIGURE_ARGS=	--with-boost=${LOCALBASE} --with-libevent=${LOCALBASE} \
 		--enable-shared --enable-static --with-zlib
 CONFIGURE_ENV+=	${MAKE_ENV}
 
-# For Erlang support, use devel/erlang-thrift.
 # For Perl support, use devel/p5-Thrift.
 # For Python support, use devel/py-thrift.
 # For Ruby support, use devel/ruby-thrift.
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 6cc526caffbf..e9a9a40da89e 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -23,7 +23,6 @@ OPTIONS=	SENDMAIL "for use with sendmail" off \
 		EXIM4 "for use with exim4" off \
 		POSTFIX "for use with postfix" off \
 		COURIER "for use with courier" off \
-		CHINESE "support for Chinese mailing lists" off \
 		HTDIG "htdig integration patches" off \
 		NAMAZU2 "make private archives searchable with namazu2" off
 
@@ -112,10 +111,6 @@ IGNORE=	can only have one MTA selected to integrate with
 MAIL_GID?=	courier
 .endif
 
-.if defined(WITH_CHINESE)
-RUN_DEPENDS+=	${PYTHONPREFIX_SITELIBDIR}/cjkcodecs.pth:${PORTSDIR}/converters/py-cjkcodecs
-.endif
-
 .if defined(WITH_HTDIG)
 BROKEN=	the HTDIG option is currently broken
 PATCH_SITES+=	http://www.openinfo.co.uk/mm/patches/444879/:patch1 \
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index d265ba4783e6..0d38cde9aa4b 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -34,7 +34,7 @@ USE_GETTEXT=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS+=--enable-system-qwtplot3d=yes --enable-system-liborigin=yes \
-		--enable-ocaml=no --enable-fftw=no
+		--enable-ocaml=no --enable-fftw=no --enable-KexiDB=no
 
 MAN1=		LabPlot.1 labplot.1
 
@@ -98,13 +98,6 @@ CONFIGURE_ARGS+=--enable-audiofile=yes
 CONFIGURE_ARGS+=--enable-audiofile=no
 .endif
 
-.if defined(WITH_KEXIDB)
-LIB_DEPENDS+=	kexidb.2:${PORTSDIR}/editors/koffice-kde3
-CONFIGURE_ARGS+=--enable-KexiDB=yes
-.else
-CONFIGURE_ARGS+=--enable-KexiDB=no
-.endif
-
 .if defined(WITH_QSA)
 LIB_DEPENDS+=	 qsa.1:${PORTSDIR}/devel/qsa
 CONFIGURE_ARGS+=--enable-qsa=yes
diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile
index 8c7d854bb217..1a5fa9defe31 100644
--- a/math/ploticus/Makefile
+++ b/math/ploticus/Makefile
@@ -61,7 +61,6 @@ do-install:
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 
 .if !defined(NO_INSTALL_MANPAGES)
-	# pl.1 conflicts with lang/TenDRA
 	${INSTALL_MAN} ${WRKSRC}/man/man1/pl.1 ${MANPREFIX}/man/man1/ploticus.1
 	${INSTALL_MAN} ${WRKSRC}/man/man3/${MAN3} ${MANPREFIX}/man/man3
 .endif
diff --git a/net-im/mercury/Makefile b/net-im/mercury/Makefile
index aacbb8616d14..e79c0f4948df 100644
--- a/net-im/mercury/Makefile
+++ b/net-im/mercury/Makefile
@@ -56,16 +56,6 @@ PLIST_SUB+=	VID="" VIDJAR="${VIDJAR}"
 PLIST_SUB+=	VID="@comment " VIDJAR=""
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-WITHOUT_TRAY=	yes
-.endif
-
-.if !defined(WITHOUT_TRAY)
-LIB_DEPENDS+=	tray.0:${PORTSDIR}/x11-toolkits/jdic
-.endif
-
 post-extract:
 	${MKDIR} ${WRKDIR}/icons
 	cd ${WRKDIR}/icons &&	\
@@ -87,4 +77,4 @@ do-install:
 	${INSTALL_DATA} ${_DISTDIR}/${VIDJAR} ${INSTDIR}/lib
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/cpupowerd/Makefile b/sysutils/cpupowerd/Makefile
index 9f4c0b96453f..f17a4424186e 100644
--- a/sysutils/cpupowerd/Makefile
+++ b/sysutils/cpupowerd/Makefile
@@ -20,8 +20,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 MAKE_ENV+=	GROUP=wheel \
 		RIGHTS=555
 
-OPTIONS=	CREATELOAD "Install createload.sh for stability testing" Off
-
 .include <bsd.port.pre.mk>
 
 .if (${OSVERSION} < 800042 && ${OSVERSION} >= 800000) || ${OSVERSION} < 701102
@@ -31,17 +29,7 @@ SUB_LIST+=	CPUCTL="cpu"
 SUB_LIST+=	CPUCTL="cpuctl"
 .endif
 
-.if defined(WITH_CREATELOAD)
-RUN_DEPENDS+=	burnMMX:${PORTSDIR}/sysutils/cpuburn
-PLIST_SUB+=	CREATELOAD=""
-.else
-PLIST_SUB+=	CREATELOAD="@comment "
-.endif
-
 post-install:
-.if defined(WITH_CREATELOAD)
-	${INSTALL_SCRIPT} ${WRKSRC}/../tools/createload.sh ${PREFIX}/bin/createload.sh
-.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../CHANGELOG ${DOCSDIR}/CHANGELOG
diff --git a/sysutils/cpupowerd/pkg-plist b/sysutils/cpupowerd/pkg-plist
index 2635c67e9b7c..28ace19ad6c4 100644
--- a/sysutils/cpupowerd/pkg-plist
+++ b/sysutils/cpupowerd/pkg-plist
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 sbin/cpupowerd
-%%CREATELOAD%%bin/createload.sh
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index c5748e06af98..0c000605b06b 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -85,7 +85,6 @@ PLIST_SUB+=		MGMT="@comment "
 .if defined(WITH_LDIRECTORD)
 RUN_DEPENDS+=		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
 			${SITE_PERL}/Mail/Send.pm:${PORTSDIR}/mail/p5-Mail-Tools
-#ipvsadm:${PORTSDIR}/net/ipvs
 USE_PERL5_RUN=		yes
 PLIST_SUB+=		LDIRECTORD=""
 MAN8+=			ldirectord.8
diff --git a/textproc/qstardict/pkg-message b/textproc/qstardict/pkg-message
index aa2fbe4c7702..94259f79d085 100644
--- a/textproc/qstardict/pkg-message
+++ b/textproc/qstardict/pkg-message
@@ -5,7 +5,6 @@ You can install some dictionaries for StarDict(QStarDict):
  chinese/stardict2-dict-zh_CN  Simplified Chinese - English
  chinese/stardict2-dict-zh_TW  Traditional Chinese - English
  japanese/stardict2-dict-ja    Japanese - English
- korean/stardict2-dict-kr	orean and foreign language Dictionaries
  textproc/stardict2-dictd_mova	Dictionaries from www.mova.org
  textproc/stardict2-quick	Dictionaries from Quick for StarDict
 =======================================================================
diff --git a/textproc/scim/pkg-message b/textproc/scim/pkg-message
index 69a708a76c5c..c6b8acee3c74 100644
--- a/textproc/scim/pkg-message
+++ b/textproc/scim/pkg-message
@@ -9,7 +9,6 @@ Language-specific IMEngines
 ---------------------------
 
  chinese/scim-array         Module for Array30
- chinese/scim-chewing       Chewing Chinese methods
  chinese/scim-fcitx         Module for fcitx
  chinese/scim-pinyin        Smart Pinyin method
  chinese/scim-tables        Table based input methods:
diff --git a/textproc/skim/pkg-message b/textproc/skim/pkg-message
index 48765ccbef04..07ccf160885e 100644
--- a/textproc/skim/pkg-message
+++ b/textproc/skim/pkg-message
@@ -10,7 +10,6 @@ following ports as needed:
   chinese/scim-tables	Table based input methods: Array30, CangJie, Cantonese,
                         Dayi, Erbi, EZ, Jyutping, Simplex, Wubi, Ziranma, ZhuYin
   chinese/scim-pinyin	Smart pinyin
-  chinese/scim-chewing	Chewing
 
  Korean:
   korean/scim-tables	Table based input methods: Hangul, Hanja
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index aec5b820b273..2226ca7b4141 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -34,8 +34,8 @@ CONFIG_FILE=	${LOCALBASE}/etc/kde-meta.conf
 ## The list of all modules that make up KDE, excluding the base modules
 ## arts, kdebase and kdelibs
 
-ALL_MODULES=	KDEACCESSIBILITY KDEADMIN KDEARTWORK KDEVELOP KDEEDU\
-		KDEGAMES KDEGRAPHICS KDEMULTIMEDIA KDENETWORK KOFFICE KDEPIM\
+ALL_MODULES=	KDEACCESSIBILITY KDEADMIN KDEARTWORK KDEEDU\
+		KDEGAMES KDEGRAPHICS KDEMULTIMEDIA KDENETWORK KDEPIM\
 		KDESDK KDETOYS KDEUTILS KDEWEBDEV
 
 ## Forwards parts of the environment to scripts/configure.kde3
@@ -114,9 +114,6 @@ RUN_DEPENDS+=	kjumpingcube:${PORTSDIR}/games/kdegames3
 .if !defined(WITHOUT_KDEUTILS)
 RUN_DEPENDS+=	kdessh:${PORTSDIR}/misc/kdeutils3
 .endif
-.if !defined(WITHOUT_KOFFICE)
-RUN_DEPENDS+=	kword:${PORTSDIR}/editors/koffice-kde3
-.endif
 .if !defined(WITHOUT_KDENETWORK)
 RUN_DEPENDS+=	kget:${PORTSDIR}/net/kdenetwork3
 .endif
@@ -132,9 +129,6 @@ RUN_DEPENDS+=	korganizer:${PORTSDIR}/deskutils/kdepim3
 .if !defined(WITHOUT_KDESDK)
 RUN_DEPENDS+=	cervisia:${PORTSDIR}/devel/kdesdk3
 .endif
-.if !defined(WITHOUT_KDEVELOP)
-RUN_DEPENDS+=	kdevelop:${PORTSDIR}/devel/kdevelop
-.endif
 .if !defined(WITHOUT_KDEEDU)
 RUN_DEPENDS+=	khangman:${PORTSDIR}/misc/kdeedu3
 .endif