From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Sep 27 08:30:08 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A75991065696 for ; Mon, 27 Sep 2010 08:30:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 60B088FC19 for ; Mon, 27 Sep 2010 08:30:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o8R8U8HL046640 for ; Mon, 27 Sep 2010 08:30:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o8R8U8Z8046638; Mon, 27 Sep 2010 08:30:08 GMT (envelope-from gnats) Resent-Date: Mon, 27 Sep 2010 08:30:08 GMT Resent-Message-Id: <201009270830.o8R8U8Z8046638@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Anonymous Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B79A41065673 for ; 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 ; Mon, 27 Sep 2010 08:22:52 +0000 (UTC) Received: by gwb15 with SMTP id 15so1822988gwb.13 for ; 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 To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/150982: [patch] net-p2p/ed2k: typo and wrong amule pkgname in CONFLICTS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Sep 2010 08:30:08 -0000 >Number: 150982 >Category: ports >Synopsis: [patch] net-p2p/ed2k: typo and wrong amule pkgname in CONFLICTS >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Sep 27 08:30:07 UTC 2010 >Closed-Date: >Last-Modified: >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 --- a.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: