From nobody@FreeBSD.org  Sun Dec 27 14:24:52 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3AE63106568B
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 27 Dec 2009 14:24:52 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 111788FC16
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 27 Dec 2009 14:24:52 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id nBREOp4I002456
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 27 Dec 2009 14:24:51 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id nBREOpWr002455;
	Sun, 27 Dec 2009 14:24:51 GMT
	(envelope-from nobody)
Message-Id: <200912271424.nBREOpWr002455@www.freebsd.org>
Date: Sun, 27 Dec 2009 14:24:51 GMT
From: IWAZAKI Shota <iwazaki8@yahoo.co.jp>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Ignore security/easypg if emacs23 is used
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         142072
>Category:       ports
>Synopsis:       Ignore security/easypg if emacs23 is used
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 27 14:30:01 UTC 2009
>Closed-Date:    Mon Jan 04 02:22:37 UTC 2010
>Last-Modified:  Mon Jan  4 02:30:08 UTC 2010
>Originator:     IWAZAKI Shota
>Release:        8.0-RELEASE
>Organization:
>Environment:
FreeBSD bsd.local 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Sat Nov 21 15:02:08 UTC 2009     root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
EasyPG has been part of Emacs 23.
So you won't need to install EasyPG separately with Emacs 23.

>How-To-Repeat:

>Fix:
diff -ru easypg.orig/Makefile easypg/Makefile
--- easypg.orig/Makefile	2009-07-31 22:55:38.000000000 +0900
+++ easypg/Makefile	2009-12-27 22:53:45.000000000 +0900
@@ -8,7 +8,7 @@
 PORTNAME=	easypg
 PORTVERSION=	0.0.16
 PORTREVISION=	1
-CATEGORIES=	security
+CATEGORIES=	security elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	epg/29289
 DISTNAME=	epg-${PORTVERSION}
@@ -21,10 +21,10 @@
 GNU_CONFIGURE=	yes
 USE_EMACS=	yes
 
-.if defined(WITH_COMPILED_ELISP)
-PLIST_SUB=	COMPILED_ELISP=""
-.else
-PLIST_SUB=	COMPILED_ELISP="@comment "
+.include <bsd.port.pre.mk>
+
+.if (${EMACS_PORT_NAME} == "emacs23")
+IGNORE=		easyPG has been part of Emacs 23
 .endif
 
 INFO=	epa
@@ -35,11 +35,7 @@
 do-install:
 	cd ${WRKSRC};\
 	${MKDIR} ${PREFIX}/${EMACS_SITE_LISPDIR}/epg;\
-	${INSTALL_DATA} *.el ${PREFIX}/${EMACS_SITE_LISPDIR}/epg
-.if defined(WITH_COMPILED_ELISP)
-	cd ${WRKSRC};\
-	${INSTALL_DATA} *.elc ${PREFIX}/${EMACS_SITE_LISPDIR}/epg
-.endif
+	${INSTALL_DATA} *.el *.elc ${PREFIX}/${EMACS_SITE_LISPDIR}/epg
 	cd ${WRKSRC};\
 	${INSTALL_MAN} epa.info ${PREFIX}/${INFO_PATH}
 .if !defined(NOPORTDOCS)
@@ -51,4 +47,4 @@
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ru easypg.orig/pkg-plist easypg/pkg-plist
--- easypg.orig/pkg-plist	2008-02-26 14:58:58.000000000 +0900
+++ easypg/pkg-plist	2009-12-27 22:11:08.000000000 +0900
@@ -6,12 +6,12 @@
 %%EMACS_SITE_LISPDIR%%/epg/epg-config.el
 %%EMACS_SITE_LISPDIR%%/epg/epg-package-info.el
 %%EMACS_SITE_LISPDIR%%/epg/epg.el
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/epg/epa-dired.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/epg/epa-file.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/epg/epa-mail.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/epg/epa-setup.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/epg/epa.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/epg/epg-config.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/epg/epg-package-info.elc
-%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/epg/epg.elc
+%%EMACS_SITE_LISPDIR%%/epg/epa-dired.elc
+%%EMACS_SITE_LISPDIR%%/epg/epa-file.elc
+%%EMACS_SITE_LISPDIR%%/epg/epa-mail.elc
+%%EMACS_SITE_LISPDIR%%/epg/epa-setup.elc
+%%EMACS_SITE_LISPDIR%%/epg/epa.elc
+%%EMACS_SITE_LISPDIR%%/epg/epg-config.elc
+%%EMACS_SITE_LISPDIR%%/epg/epg-package-info.elc
+%%EMACS_SITE_LISPDIR%%/epg/epg.elc
 @dirrm %%EMACS_SITE_LISPDIR%%/epg


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: sw-bug->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Sun Dec 27 14:30:13 UTC 2009 
Class-Changed-Why:  
Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142072 
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Tue Dec 29 06:06:57 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142072 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Mon Jan 4 02:22:36 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142072 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142072: commit references a PR
Date: Mon,  4 Jan 2010 02:22:35 +0000 (UTC)

 pgollucci    2010-01-04 02:22:26 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/easypg      Makefile pkg-plist 
   Log:
   - CATEGORIES += elisp
   - mark IGNORE for editors/emacs23
   
   PR:             ports/142072
   Submitted by:   maintainer
   
   Revision  Changes    Path
   1.5       +8 -12     ports/security/easypg/Makefile
   1.2       +8 -8      ports/security/easypg/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
