ports/118210: editors/emacs21: [PATCH]: make FETCHABLE again, portlint cleanups

[Philip M. Gollucci]

>Number:         118210
>Category:       ports
>Synopsis:       editors/emacs21: [PATCH]: make FETCHABLE again, portlint cleanups
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 23 09:10:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 8.0-CURRENT
>Organization:
Riderway Inc.
>Environment:
FreeBSD goku.p6m7g8.net 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sun Nov  4 01:36:52 EDT 2007     pgollucci at home.p6m7g8.net:/usr/obj/usr/src/sys/HOME  i386

>Description:
GNU moved emacs-21.3 to gnu-old directory ~Nov 18th.  The new one 21.4a is alpha so I didn't upgrade the port.

Some minor portlint things while here too.

Note, port is _NOT_ DATADIR safe.

>How-To-Repeat:

>Fix:
apply patch

Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/emacs21/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	16 Jul 2007 17:02:46 -0000	1.21
+++ Makefile	22 Nov 2007 07:09:15 -0000
@@ -7,11 +7,17 @@
 
 PORTNAME=	emacs
 PORTVERSION=	21.3
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	editors ipv6
-MASTER_SITES=		${MASTER_SITE_GNU}
+MASTER_SITES=		${MASTER_SITE_GNU:C/\/gnu\//\/old-gnu\//g}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
+.if defined(WITH_MENUBAR_FONTSET)
+PATCH_SITES=		http://nijino.homelinux.net/emacs/
+PATCHFILES=		emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
+PATCH_DIST_STRIP=	-p1
+.endif
+
 MAINTAINER=	nobutaka at FreeBSD.org
 COMMENT=	GNU editing macros
 
@@ -29,12 +35,6 @@
 USE_XPM=	yes
 .endif
 
-.if defined(WITH_MENUBAR_FONTSET)
-PATCH_SITES=		http://nijino.homelinux.net/emacs/
-PATCHFILES=		emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
-PATCH_DIST_STRIP=	-p1
-.endif
-
 USE_AUTOTOOLS=	autoconf:213
 USE_GMAKE=	yes
 
@@ -55,7 +55,7 @@
 INFO=		ada-mode autotype ccmode cl dired-x ebrowse ediff \
 		efaq emacs emacs-mime eshell eudc forms gnus idlwave \
 		info message mh-e pcl-cvs reftex sc speedbar vip \
-		viper widget woman 
+		viper widget woman
 
 LATEST_LINK=	emacs21
 
Index: pkg-message
===================================================================
RCS file: /home/ncvs/ports/editors/emacs21/pkg-message,v
retrieving revision 1.4
diff -u -r1.4 pkg-message
--- pkg-message	16 Jul 2007 17:02:46 -0000	1.4
+++ pkg-message	22 Nov 2007 07:13:21 -0000
@@ -4,7 +4,7 @@
 *     LEIM: Libraries of Emacs Input Method                        *
 *   package.                                                       *
 *   You can find leim port in the following directory:             *
-*     /usr/ports/editors/leim21                                    *
+*     ${PORTSDIR}/editors/leim21                                   *
 *                                                                  *
 *   If you want to use multibyte characters in the menubar,        *
 *     make WITH_MENUBAR_FONTSET=yes install                        *


>Release-Note:
>Audit-Trail:
>Unformatted: