From nobody@FreeBSD.org  Mon Jul 30 12:38:49 2007
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 23A8216A41A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 30 Jul 2007 12:38:49 +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 0AF8913C461
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 30 Jul 2007 12:38:49 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l6UCcmKl099526
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 30 Jul 2007 12:38:48 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id l6UCcmoC099525;
	Mon, 30 Jul 2007 12:38:48 GMT
	(envelope-from nobody)
Message-Id: <200707301238.l6UCcmoC099525@www.freebsd.org>
Date: Mon, 30 Jul 2007 12:38:48 GMT
From: Michael Johnson <ahze@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] mail/eps -- Install header files in include/eps and minor cleanup
X-Send-Pr-Version: www-3.0

>Number:         115038
>Category:       ports
>Synopsis:       [PATCH] mail/eps -- Install header files in include/eps and minor cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ahze
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 30 12:40:03 GMT 2007
>Closed-Date:    Wed Aug 22 14:37:56 GMT 2007
>Last-Modified:  Wed Aug 22 14:40:02 GMT 2007
>Originator:     Michael Johnson
>Release:        
>Organization:
>Environment:
>Description:
- Install header files in include/eps instead of include/, installing in include/ conflicts with multimedia/ffmpeg. Plus installing in include/eps is the default of eps

root@buh /usr/ports/mail/eps/work/eps-1.5 > grep usr\/include Makefile
INCDIR = /usr/include/eps

- Update include flags in epstools
- Remove RUN_DEPENDS from epstools, its not needed.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/eps/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	10 May 2006 22:36:50 -0000	1.2
+++ Makefile	30 Jul 2007 12:32:07 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	eps
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/eps/
 
@@ -24,7 +25,8 @@
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libeps.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include/
+	${MKDIR} ${PREFIX}/include/eps
+	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include/eps
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/mail/eps/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	21 Jul 2005 16:46:22 -0000	1.1
+++ pkg-plist	30 Jul 2007 12:32:07 -0000
@@ -1,19 +1,20 @@
-include/address.h
-include/base64.h
-include/boundary.h
-include/buffer.h
-include/content.h
-include/email.h
-include/eps.h
-include/fold.h
-include/header.h
-include/int_buffer.h
-include/int_stream.h
-include/interface.h
-include/line.h
-include/mime.h
-include/misc.h
-include/qp.h
-include/rfc2822.h
-include/unfold.h
+include/eps/address.h
+include/eps/base64.h
+include/eps/boundary.h
+include/eps/buffer.h
+include/eps/content.h
+include/eps/email.h
+include/eps/eps.h
+include/eps/fold.h
+include/eps/header.h
+include/eps/int_buffer.h
+include/eps/int_stream.h
+include/eps/interface.h
+include/eps/line.h
+include/eps/mime.h
+include/eps/misc.h
+include/eps/qp.h
+include/eps/rfc2822.h
+include/eps/unfold.h
 lib/libeps.a
+@dirrm include/eps
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/epstools/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	10 May 2006 22:36:50 -0000	1.2
+++ Makefile	30 Jul 2007 12:32:18 -0000
@@ -13,11 +13,10 @@
 COMMENT=	EPS (Email Parsing System) sample tools
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libeps.a:${PORTSDIR}/mail/eps
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PORTDOCS=	README
 
-MAKE_ENV+=	DEFS="-I${LOCALBASE}/include ${CFLAGS}"
+MAKE_ENV+=	DEFS="-I${LOCALBASE}/include/eps ${CFLAGS}"
 SUB_FILES=	pkg-message
 
 EXAMPLE_FILES=	addr.1 addr.2 addr.3 addr.4 email.1 email.2 virus.email


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ahze 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jul 30 12:40:10 UTC 2007 
Responsible-Changed-Why:  
Submitter has GNATS access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115038 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Jul 30 12:40:16 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115038 
State-Changed-From-To: feedback->closed  
State-Changed-By: ahze 
State-Changed-When: Wed Aug 22 14:37:39 UTC 2007 
State-Changed-Why:  
Committed with maintainer timeout 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/115038: commit references a PR
Date: Wed, 22 Aug 2007 14:37:44 +0000 (UTC)

 ahze        2007-08-22 14:37:36 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/eps             Makefile pkg-plist 
     mail/epstools        Makefile 
   Log:
   - Install header files in include/eps instead of include/ to not conflict
     with ffmpeg
   
   PR:             ports/115038
   Approved by:    maintainer timeout
   
   Revision  Changes    Path
   1.3       +3 -1      ports/mail/eps/Makefile
   1.2       +19 -18    ports/mail/eps/pkg-plist
   1.3       +1 -1      ports/mail/epstools/Makefile
 _______________________________________________
 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:
