ports/150982: [patch] net-p2p/ed2k: typo and wrong amule pkgname in CONFLICTS
Anonymous
swell.k at gmail.com
Mon Sep 27 08:30:08 UTC 2010
>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 at 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:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list