From swell.k@gmail.com  Mon Sep 27 08:22:52 2010
Return-Path: <swell.k@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B79A41065673
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 27 Sep 2010 08:22:52 +0000 (UTC)
	(envelope-from swell.k@gmail.com)
Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54])
	by mx1.freebsd.org (Postfix) with ESMTP id 7479F8FC27
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 27 Sep 2010 08:22:52 +0000 (UTC)
Received: by gwb15 with SMTP id 15so1822988gwb.13
        for <FreeBSD-gnats-submit@freebsd.org>; Mon, 27 Sep 2010 01:22:51 -0700 (PDT)
Received: by 10.150.166.15 with SMTP id o15mr8419781ybe.38.1285575770158;
        Mon, 27 Sep 2010 01:22:50 -0700 (PDT)
Received: from localhost ([208.53.142.42])
        by mx.google.com with ESMTPS id w3sm5502004ybi.19.2010.09.27.01.22.48
        (version=SSLv3 cipher=RC4-MD5);
        Mon, 27 Sep 2010 01:22:49 -0700 (PDT)
Message-Id: <86lj6nfve5.fsf@gmail.com>
Date: Mon, 27 Sep 2010 12:22:42 +0400
From: Anonymous <swell.k@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] net-p2p/ed2k: typo and wrong amule pkgname in CONFLICTS

>Number:         150982
>Category:       ports
>Synopsis:       [patch] net-p2p/ed2k: typo and wrong amule pkgname in CONFLICTS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 27 08:30:07 UTC 2010
>Closed-Date:    Tue Oct 05 10:57:00 CEST 2010
>Last-Modified:  Tue Oct  5 18:50:01 UTC 2010
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
- fix typo: CONFILTCS vs. CONFLICTS
- use current lowercase amule pkgname in CONFLICTS
- stop altering PKGNAME, PKGNAMESUFFIX2 doesn't exist anyway
- don't abuse LDLIBS for CPPFLAGS
- use NO_WRKSUBDIR
- install verbosely like most ports do
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: net-p2p/ed2k/Makefile
===================================================================
RCS file: /a/.cvsup/ports/net-p2p/ed2k/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- net-p2p/ed2k/Makefile	30 Jan 2008 08:25:45 -0000	1.3
+++ net-p2p/ed2k/Makefile	27 Sep 2010 08:19:24 -0000
@@ -9,7 +9,7 @@ PORTNAME=	ed2k
 PORTVERSION=	1.4
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://www.sdalu.com/download/software/tools/
-PKGNAMESUFFIX=	-hash${PKGNAMESUFFIX2}
+PKGNAMESUFFIX=	-hash
 DISTNAME=	ed2k.c
 EXTRACT_SUFX=
 EXTRACT_ONLY=
@@ -17,26 +17,25 @@ EXTRACT_ONLY=
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Calculates 'eMule' hashes or producing ed2k:// file links
 
-CONFILTCS=	aMule-*
-WRKSRC=		${WRKDIR}
+CONFLICTS=	amule-*
+
+NO_WRKSUBDIR=	yes
 MAKEFILE=	/dev/null
 ALL_TARGET=	ed2k
 PLIST_FILES=	bin/ed2k
+MAKE_ENV+=	LDLIBS="${LDLIBS}"
 
 .if defined(WITHOUT_OPENSSL)
-CPPFLAGS+=	-DWITH_RSA
-MAKE_ENV+=	LDLIBS="${CPPFLAGS}"
+CFLAGS+=	-DWITH_RSA
 .else
 USE_OPENSSL=	yes
-OPENSSLSUFFIX=	-openssl
 LDLIBS+=	-lmd
-MAKE_ENV+=	LDLIBS="${LDLIBS}"
 .endif
 
 post-extract:
 	${CP} -p ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC}/
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/ed2k ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/ed2k ${PREFIX}/bin/
 
 .include <bsd.port.mk>
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dinoex 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Sep 27 08:30:18 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150982: commit references a PR
Date: Tue,  5 Oct 2010 08:46:44 +0000 (UTC)

 dinoex      2010-10-05 08:46:40 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-p2p/ed2k         Makefile 
   Log:
   - fix typo: CONFILTCS vs. CONFLICTS
   - use current lowercase amule pkgname in CONFLICTS
   - don't abuse LDLIBS for CPPFLAGS
   - use NO_WRKSUBDIR
   - install verbosely like most ports do
   PR:             150982
   Submitted by:   swell.k
   
   - Fix PKGNAME logic
   
   Revision  Changes    Path
   1.4       +11 -8     ports/net-p2p/ed2k/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"
 
State-Changed-From-To: open->closed 
State-Changed-By: dinoex 
State-Changed-When: Tue Oct 5 10:55:06 CEST 2010 
State-Changed-Why:  
committed with small chenags, thanks. 

regression found: 
CFLAGS+= was not passed if you have CFLAGS in /etc/make.conf 


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

From: Anonymous <swell.k@gmail.com>
To: Dirk Meyer <dinoex@FreeBSD.org>
Cc: bug-followup@FreeBSD.org, ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: ports/150982: [patch] net-p2p/ed2k: typo and wrong amule pkgname in CONFLICTS
Date: Tue, 05 Oct 2010 19:35:03 +0400

 (subject modified for gnats)
 
 Dirk Meyer <dinoex@FreeBSD.org> writes:
 
 > regression found:
 > CFLAGS+= was not passed if you have CFLAGS in /etc/make.conf
 
 Did you by chance use CFLAGS= instead of CFLAGS+= in make.conf?
 
 > dinoex      2010-10-05 08:46:40 UTC
 >
 >   FreeBSD ports repository
 >
 >   Modified files:
 >     net-p2p/ed2k         Makefile
 >   Log:
 >   - fix typo: CONFILTCS vs. CONFLICTS
 
 Typo is still there.
 
 >   - use current lowercase amule pkgname in CONFLICTS
 >   - don't abuse LDLIBS for CPPFLAGS
 >   - use NO_WRKSUBDIR
 >   - install verbosely like most ports do
 >   PR:             150982
 >   Submitted by:   swell.k
 
 >   - Fix PKGNAME logic
 
 It breaks CONFLICTS in amule ports even more.
 And remove PKGNAMESUFFIX2 if it's not defined anywhere.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150982: commit references a PR
Date: Tue,  5 Oct 2010 18:41:05 +0000 (UTC)

 dinoex      2010-10-05 18:40:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-p2p/ed2k         Makefile 
   Log:
   _ fix typo in CONFILTCS
   PR:             150982
   
   Revision  Changes    Path
   1.5       +1 -1      ports/net-p2p/ed2k/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:
