Date: Sun, 16 Dec 2012 12:05:19 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309002 - head/sysutils/gkrellm2 Message-ID: <201212161205.qBGC5Jvf070924@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Sun Dec 16 12:05:19 2012 New Revision: 309002 URL: http://svnweb.freebsd.org/changeset/ports/309002 Log: - Use OPTIONS_RADIO for OpenSSL/GnuTLS selection. - Add DOCS to OPTIONS. - Remove ABI version numbers from LIB_DEPENDS. - Trim Makefile header. Modified: head/sysutils/gkrellm2/Makefile Modified: head/sysutils/gkrellm2/Makefile ============================================================================== --- head/sysutils/gkrellm2/Makefile Sun Dec 16 12:04:18 2012 (r309001) +++ head/sysutils/gkrellm2/Makefile Sun Dec 16 12:05:19 2012 (r309002) @@ -1,9 +1,4 @@ -# New ports collection makefile for: gkrellm -# Date Created: Mar 4 2000 -# Whom: Hajimu UMEMOTO <ume@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= gkrellm PORTVERSION= 2.3.5 @@ -23,13 +18,12 @@ USE_BZIP2= yes USE_GMAKE= yes USE_RC_SUBR= gkrellmd WANT_GNOME= yes -USE_OPENSSL= yes # cannot set after bsd.port.pre.mk -OPTIONS_DEFINE= GKRELLM_CLIENT NLS NTLM SSL -OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= GNUTLS OPENSSL -OPTIONS_DEFAULT= GKRELLM_CLIENT NLS NTLM SSL OPENSSL -GKRELLM_CLIENT_DESC= Enable GKrellM Client +OPTIONS_DEFINE= DOCS GKRELLM_CLIENT NLS NTLM +OPTIONS_RADIO= SSL +OPTIONS_RADIO_SSL= GNUTLS OPENSSL +OPTIONS_DEFAULT= GKRELLM_CLIENT NTLM OPENSSL +GKRELLM_CLIENT_DESC= GKrellM Client .include <bsd.port.options.mk> @@ -42,15 +36,13 @@ USE_GETTEXT= yes MAKE_ENV+= enable_nls=0 .endif USE_XORG= x11 sm -.if ${PORT_OPTIONS:MSSL} .if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= gnutls-openssl.27:${PORTSDIR}/security/gnutls +LIB_DEPENDS+= gnutls-openssl:${PORTSDIR}/security/gnutls MAKE_ENV+= GNUTLSINC=${LOCALBASE}/include GNUTLSLIB=${LOCALBASE}/lib \ without-ssl=1 .elif ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes MAKE_ENV+= without-gnutls=1 -.endif .else MAKE_ENV+= without-gnutls=1 without-ssl=1 .endif @@ -61,7 +53,7 @@ USE_GNOME= glib20 .endif .if ${PORT_OPTIONS:MNTLM} -LIB_DEPENDS+= ntlm.0:${PORTSDIR}/security/libntlm +LIB_DEPENDS+= ntlm:${PORTSDIR}/security/libntlm .else MAKE_ENV+= without-ntlm=1 .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212161205.qBGC5Jvf070924>