aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordinoex <dinoex@FreeBSD.org>2010-10-05 16:46:40 +0800
committerdinoex <dinoex@FreeBSD.org>2010-10-05 16:46:40 +0800
commit278d6665742f3df80fc20c98b0c4841810c980f8 (patch)
tree6b6c171a48c67e3362f895ba925c1e1129fa4787
parent6c842cb2b6f4fa2e611679ebfc74f1f40dcc8ec2 (diff)
downloadfreebsd-ports-gnome-278d6665742f3df80fc20c98b0c4841810c980f8.tar.gz
freebsd-ports-gnome-278d6665742f3df80fc20c98b0c4841810c980f8.tar.zst
freebsd-ports-gnome-278d6665742f3df80fc20c98b0c4841810c980f8.zip
- 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
-rw-r--r--net-p2p/ed2k/Makefile19
1 files changed, 11 insertions, 8 deletions
diff --git a/net-p2p/ed2k/Makefile b/net-p2p/ed2k/Makefile
index e1723b927e3a..3c9d95119084 100644
--- a/net-p2p/ed2k/Makefile
+++ b/net-p2p/ed2k/Makefile
@@ -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${OPENSSLSUFFIX}${PKGNAMESUFFIX2}
DISTNAME= ed2k.c
EXTRACT_SUFX=
EXTRACT_ONLY=
@@ -17,26 +17,29 @@ EXTRACT_ONLY=
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Calculates 'eMule' hashes or producing ed2k:// file links
-CONFILTCS= aMule-*
-WRKSRC= ${WRKDIR}
+CONFILTCS= amule-*
+
+NO_WRKSUBDIR= yes
MAKEFILE= /dev/null
ALL_TARGET= ed2k
PLIST_FILES= bin/ed2k
.if defined(WITHOUT_OPENSSL)
-CPPFLAGS+= -DWITH_RSA
-MAKE_ENV+= LDLIBS="${CPPFLAGS}"
+OPENSSLSUFFIX= -rsa
+CFLAGS+= -DWITH_RSA
.else
-USE_OPENSSL= yes
OPENSSLSUFFIX= -openssl
+USE_OPENSSL= yes
LDLIBS+= -lmd
-MAKE_ENV+= LDLIBS="${LDLIBS}"
.endif
+MAKE_ARGS+= CFLAGS="${CFLAGS}"
+MAKE_ENV+= LDLIBS="${LDLIBS}"
+
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>