svn commit: r317153 - in head: . japanese japanese/navi2ch japanese/navi2ch-emacs21 japanese/navi2ch-xemacs21-mule

[Hiroki Sato]

Author: hrs
Date: Thu May  2 21:41:04 2013
New Revision: 317153
URL: http://svnweb.freebsd.org/changeset/ports/317153

Log:
  - Trim old-style header.
  - Add LICENSE.
  - Use OPTIONS_DEFINE.
  - Remove japanese/navi2ch-emacs21 and japanese/navi2ch-xemacs21-mule because
    they are obsolete.

Deleted:
  head/japanese/navi2ch-emacs21/
  head/japanese/navi2ch-xemacs21-mule/
Modified:
  head/MOVED
  head/japanese/Makefile
  head/japanese/navi2ch/Makefile
  head/japanese/navi2ch/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu May  2 21:28:26 2013	(r317152)
+++ head/MOVED	Thu May  2 21:41:04 2013	(r317153)
@@ -4245,3 +4245,5 @@ www/squid31||2013-05-01|Has expired: No 
 converters/ruby-bsdconv|converters/rubygem-bsdconv|2013-05-01|Moved to Rubygems
 editors/nxml-emacs21||2013-05-02|Removed: obsolete
 textproc/ruby-libxml||2013-05-02|Has expired: Does not work with Ruby 1.9
+japanese/navi2ch-emacs21|japanese/navi2ch|2013-05-02|Removed: obsolete
+japanese/navi2ch-xemacs21-mule|japanese/navi2ch|2013-05-02|Removed: obsolete

Modified: head/japanese/Makefile
==============================================================================
--- head/japanese/Makefile	Thu May  2 21:28:26 2013	(r317152)
+++ head/japanese/Makefile	Thu May  2 21:41:04 2013	(r317153)
@@ -201,8 +201,6 @@
     SUBDIR += namazu
     SUBDIR += namazu2
     SUBDIR += navi2ch
-    SUBDIR += navi2ch-emacs21
-    SUBDIR += navi2ch-xemacs21-mule
     SUBDIR += ne
     SUBDIR += nethack34
     SUBDIR += netype

Modified: head/japanese/navi2ch/Makefile
==============================================================================
--- head/japanese/navi2ch/Makefile	Thu May  2 21:28:26 2013	(r317152)
+++ head/japanese/navi2ch/Makefile	Thu May  2 21:41:04 2013	(r317153)
@@ -1,47 +1,42 @@
-# New ports collection makefile for:	navi2ch for Emacsen
-# Date created:		13 May 2001
-# Whom:			FUJISHIMA Satsuki <sf at FreeBSD.org>
-#
+# Created by: FUJISHIMA Satsuki <sf at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	navi2ch
 PORTVERSION=	1.8.4
 PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	japanese www elisp
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	hrs at FreeBSD.org
 COMMENT=	2ch.net and 2ch-like BBS navigator for Emacsen
 
+LICENSE=	GPLv2
+
 USE_EMACS=	yes
-INFO=		navi2ch
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	EMACS="${EMACS_CMD}"
 CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/${LISPDIR}/${PORTNAME}
-PORTDOCS=	${PORTDOC_FILES} contrib
 PLIST_SUB=	LISPDIR=${LISPDIR}
+PORTDOCS=	${PORTDOC_FILES} contrib
+
+INFO=		navi2ch
 
 PORTDOC_FILES=	ChangeLog README TODO
 PORTDOC_LISPS=	gikope.el navi2ch-logo.el navi2ch-migemo.el
+LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS X11
+OPTIONS_DEFAULT=DOCS X11
 
-.if ${EMACS_PORT_NAME} == xemacs21-mule
-LISPDIR=	${EMACS_SITE_LISPDIR}
-PLIST_SUB+=	FSF="@comment "
-.else
-LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}
-PLIST_SUB+=	FSF=""
-.if !defined(WITHOUT_X11)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
 RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/monak12.pcf.gz:${PORTSDIR}/japanese/monafonts
 .endif
-.endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && \
@@ -51,4 +46,4 @@ post-install:
 		${INSTALL_DATA} ${PORTDOC_LISPS} ${DOCSDIR}/contrib
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/japanese/navi2ch/pkg-plist
==============================================================================
--- head/japanese/navi2ch/pkg-plist	Thu May  2 21:28:26 2013	(r317152)
+++ head/japanese/navi2ch/pkg-plist	Thu May  2 21:41:04 2013	(r317153)
@@ -71,4 +71,3 @@
 %%LISPDIR%%/navi2ch/navi2ch.el
 %%LISPDIR%%/navi2ch/navi2ch.elc
 @dirrm %%LISPDIR%%/navi2ch
-%%FSF%%@dirrmtry %%LISPDIR%%