From mail@sysfault.org  Mon Jun  4 11:05:36 2007
Return-Path: <mail@sysfault.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4F2CA16A400
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  4 Jun 2007 11:05:36 +0000 (UTC)
	(envelope-from mail@sysfault.org)
Received: from smtprelay01.ispgateway.de (smtprelay01.ispgateway.de [80.67.18.13])
	by mx1.freebsd.org (Postfix) with ESMTP id B453213C48A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  4 Jun 2007 11:05:35 +0000 (UTC)
	(envelope-from mail@sysfault.org)
Received: (qmail 32583 invoked from network); 4 Jun 2007 11:05:32 -0000
Received: from unknown (HELO medusa.sysfault.org) (936934@[81.14.161.247])
          (envelope-sender <mail@sysfault.org>)
          by smtprelay01.ispgateway.de (qmail-ldap-1.03) with AES256-SHA encrypted SMTP
          for <miwi@freebsd.org>; 4 Jun 2007 11:05:32 -0000
Received: from localhost ([127.0.0.1] helo=medusa.sysfault.org)
	by medusa.sysfault.org with esmtp (Exim 4.67 (FreeBSD))
	(envelope-from <mail@sysfault.org>)
	id 1HvAON-000L5k-8S; Mon, 04 Jun 2007 13:06:31 +0200
Received: (from marcus@localhost)
	by medusa.sysfault.org (8.13.1/8.13.1/Submit) id l54B6U16080984;
	Mon, 4 Jun 2007 13:06:30 +0200 (CEST)
	(envelope-from marcus)
Message-Id: <200706041106.l54B6U16080984@medusa.sysfault.org>
Date: Mon, 4 Jun 2007 13:06:30 +0200 (CEST)
From: Marcus von Appen <mva@sysfault.org>
Reply-To: Marcus von Appen <mva@sysfault.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: miwi@freebsd.org, kris@obsecurity.org
Subject: [Maintainer-update]: x11-fm/emelfm2 RELENG_5 fix
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         113321
>Category:       ports
>Synopsis:       [Maintainer-update]: x11-fm/emelfm2 RELENG_5 fix
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 04 11:10:04 GMT 2007
>Closed-Date:    Mon Jun 04 12:53:33 GMT 2007
>Last-Modified:  Mon Jun  4 13:00:11 GMT 2007
>Originator:     Marcus von Appen
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD medusa.sysfault.org 6.2-STABLE FreeBSD 6.2-STABLE #1: Sat Apr 7 22:24:16 CEST 2007 root@medusa.sysfault.org:/usr/obj/usr/src/sys/MEDUSA i386


	
>Description:
	As reported via pointyhat, the build of emelfm2 breaks due to
        an undefined blksize_t type, which is not available on RELENG_5
        platforms. The attached patch should fix this.

        Note: The main website of emelfm2 is currently not available,
        so you might have to get the emelfm2-0.3.4.tar.gz package from
        somewhere else or wait until the website is online again :-/.

        I'm not sure, whether the PORTREVISION bump is necessary in this
        case, so you might remove it, if you do not think, it makes
        sense here.
 
>How-To-Repeat:
	Try to compile emelfm2 on RELENG_5.
>Fix:

diff -Nur emelfm2/Makefile emelfm2.new/Makefile
--- emelfm2/Makefile	Sun May 27 21:49:38 2007
+++ emelfm2.new/Makefile	Mon Jun  4 12:39:58 2007
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	emelfm2
+PORTREVISION=	1
 PORTVERSION=	0.3.4
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.emelfm2.net/rel/ \
@@ -85,8 +86,8 @@
 
 .if ${OSVERSION} < 600000
 post-patch:
-	@${REINPLACE_CMD} -e 's|blksize_t buf_size =|__int32_t buf_size =|g' \
-		${WRKSRC}/src/e2_task_backend.c
+        @${REINPLACE_CMD} -e 's|blksize_t buf_size =|__int32_t buf_size =|g' \
+                ${WRKSRC}/src/filesystem/e2_fs.c
 .endif
 
 .include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon Jun 4 11:13:46 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

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

From: Marcus von Appen <mva@sysfault.org>
To: bug-followup@freebsd.org, miwi@freebsd.org
Cc:  
Subject: Re: ports/113321: [Maintainer-update]: x11-fm/emelfm2 RELENG_5 fix
Date: Mon, 4 Jun 2007 13:45:26 +0200

 --Fig2xvG2VGoz8o/s
 Content-Type: multipart/mixed; boundary="NDin8bjvE/0mNLFQ"
 Content-Disposition: inline
 
 
 --NDin8bjvE/0mNLFQ
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 After miwi had to point me to some crucial errors within the last patch,
 here is a fixed up version, which also removes RELENG_4 support.
 
 Regards
 Marcus
 
 --NDin8bjvE/0mNLFQ
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="emelfm2.diff"
 Content-Transfer-Encoding: quoted-printable
 
 diff -Nur emelfm2/Makefile emelfm2.new/Makefile
 --- emelfm2/Makefile	Sun May 27 21:49:38 2007
 +++ emelfm2.new/Makefile	Mon Jun  4 13:38:11 2007
 @@ -7,6 +7,7 @@
 =20
  PORTNAME=3D	emelfm2
  PORTVERSION=3D	0.3.4
 +PORTREVISION=3D	1
  CATEGORIES=3D	x11-fm
  MASTER_SITES=3D	http://www.emelfm2.net/rel/ \
  		${MASTER_SITE_LOCAL}
 @@ -41,7 +42,7 @@
  .endif
 =20
  .if defined(WITH_GAMIN) && defined(WITH_FAM)
 -BROKEN=3D	"WITH_GAMIN and WITH_FAM cannot be enabled at the same time for =
 this port"
 +BROKEN=3D	WITH_GAMIN and WITH_FAM cannot be enabled at the same time for t=
 his port
  .endif
 =20
  .if defined(WITH_GAMIN)
 @@ -79,14 +80,10 @@
  PLIST_SUB+=3D	NLS=3D"@comment "
  .endif
 =20
 -.if ${OSVERSION} < 500000
 -USE_GCC=3D	3.4
 -.endif
 -
  .if ${OSVERSION} < 600000
  post-patch:
  	@${REINPLACE_CMD} -e 's|blksize_t buf_size =3D|__int32_t buf_size =3D|g' \
 -		${WRKSRC}/src/e2_task_backend.c
 + 		${WRKSRC}/src/filesystem/e2_fs.c
  .endif
 =20
  .include <bsd.port.post.mk>
 
 --NDin8bjvE/0mNLFQ--
 
 --Fig2xvG2VGoz8o/s
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (FreeBSD)
 
 iD8DBQFGY/tWo/JpszXavhwRAiLLAKCg8Qi/HR2/p4GneGg7sCpbBtHnMwCgomlK
 Xxs1vXBmfGusKmlOcTebRM0=
 =TK7H
 -----END PGP SIGNATURE-----
 
 --Fig2xvG2VGoz8o/s--
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Jun 4 12:53:31 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/113321: commit references a PR
Date: Mon,  4 Jun 2007 12:53:28 +0000 (UTC)

 miwi        2007-06-04 12:53:21 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-fm/emelfm2       Makefile 
   Log:
   - Fix build on FreeBSD 5.X [1]
   - Remove 4.X gruft
   - Makefile cleanup
   
   PR:             113321
   Submitted by:   pointyhat via kris [1]
                   Marcus von Appen <mva@sysfault.org> (maintainer)
   
   Revision  Changes    Path
   1.33      +3 -6      ports/x11-fm/emelfm2/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:
