Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Feb 2014 19:06:30 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342361 - in head/security/openvpn-auth-radius: . files
Message-ID:  <201402021906.s12J6UHh089308@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sun Feb  2 19:06:30 2014
New Revision: 342361
URL: http://svnweb.freebsd.org/changeset/ports/342361
QAT: https://qat.redports.org/buildarchive/r342361/

Log:
  security/openvpn-auth-radius: Fix build on FreeBSD 10+
  
  In addition to PR, convert USE_GMAKE and use new library callouts.
  
  PR:		ports/185439
  Submitted by:	Andras JAKO
  Fixed by:	maintainer (Mikhail Tsatsenko)

Added:
  head/security/openvpn-auth-radius/files/
  head/security/openvpn-auth-radius/files/patch-Makefile.bsd   (contents, props changed)
Modified:
  head/security/openvpn-auth-radius/Makefile

Modified: head/security/openvpn-auth-radius/Makefile
==============================================================================
--- head/security/openvpn-auth-radius/Makefile	Sun Feb  2 19:04:21 2014	(r342360)
+++ head/security/openvpn-auth-radius/Makefile	Sun Feb  2 19:06:30 2014	(r342361)
@@ -12,12 +12,12 @@ DISTNAME=	radiusplugin_v${PORTVERSION}
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	RADIUS authentication plugin for OpenVPN
 
-RUN_DEPENDS=	openvpn:${PORTSDIR}/security/openvpn
-LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
-
 LICENSE=	GPLv2
 
-USE_GMAKE=	yes
+RUN_DEPENDS=	${LOCALBASE}/sbin/openvpn:${PORTSDIR}/security/openvpn
+LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+
+USES=		gmake
 MAKEFILE=	Makefile.bsd
 WRKSRC=		${WRKDIR}/radiusplugin
 
@@ -25,20 +25,19 @@ PORTDOCS=	README
 PORTEXAMPLES=	radiusplugin.cnf
 PLIST_FILES=	lib/radiusplugin.so
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 do-install:
-	${INSTALL_LIB} ${WRKSRC}/radiusplugin.so ${LOCALBASE}/lib
+	${INSTALL_LIB} ${WRKSRC}/radiusplugin.so ${STAGEDIR}${LOCALBASE}/lib
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/radiusplugin.cnf ${EXAMPLESDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/radiusplugin.cnf ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>

Added: head/security/openvpn-auth-radius/files/patch-Makefile.bsd
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/openvpn-auth-radius/files/patch-Makefile.bsd	Sun Feb  2 19:06:30 2014	(r342361)
@@ -0,0 +1,9 @@
+--- ./Makefile.bsd.orig	2010-04-06 19:07:33.000000000 +0200
++++ ./Makefile.bsd	2014-01-03 11:29:36.000000000 +0100
+@@ -1,4 +1,4 @@
+-CC=g++
++CC?=g++
+ INCL=-I/usr/local/include
+ LDFLAGS=-L/usr/local/lib
+ LIBS=-lgcrypt -lgpg-error -lstdc++ -lm -lpthread
+



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402021906.s12J6UHh089308>