From dec62e8b3a11e43ae74e3618dcf6e84c42fd90b3 Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Mon, 10 Mar 2014 08:28:36 +0000
Subject: - Remove optional dependency on expired audio/beep - Use option
helpers - Use new LIB_DEPENDS syntax - Fix pkg-plist
Approved by: portmgr (infrastructure blanket)
---
net-im/freetalk/Makefile | 22 ++++++----------------
net-im/freetalk/pkg-plist | 1 +
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/net-im/freetalk/Makefile b/net-im/freetalk/Makefile
index da199cb15a47..9ff014621bb8 100644
--- a/net-im/freetalk/Makefile
+++ b/net-im/freetalk/Makefile
@@ -11,10 +11,9 @@ MASTER_SITES= SAVANNAH/freetalk \
MAINTAINER= olevole@olevole.ru
COMMENT= GNU console based Jabber client
-OPTIONS_DEFINE= BEEP NLS
-BEEP_DESC= Use beep program
+OPTIONS_DEFINE= NLS
-LIB_DEPENDS= loudmouth-1.0:${PORTSDIR}/net-im/loudmouth
+LIB_DEPENDS= libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth
BUILD_DEPENDS= guile>=1.8.6:${PORTSDIR}/lang/guile
RUN_DEPENDS= guile>=1.8.6:${PORTSDIR}/lang/guile
@@ -24,19 +23,10 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-.include <bsd.port.options.mk>
+OPTIONS_SUB= yes
-.if ${PORT_OPTIONS:MNLS}
-PLIST_SUB+= NLS=""
-USES+= gettext
-CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MBEEP}
-RUN_DEPENDS+= ${LOCALBASE}/bin/beep:${PORTSDIR}/audio/beep
-.endif
+NLS_USES= gettext
+NLS_CONFIGURE_WITH=libintl-prefix=${LOCALBASE}
+NLS_CONFIGURE_OFF= --disable-nls
.include <bsd.port.mk>
diff --git a/net-im/freetalk/pkg-plist b/net-im/freetalk/pkg-plist
index 82d5bcaa17fc..c9d6ffa21279 100644
--- a/net-im/freetalk/pkg-plist
+++ b/net-im/freetalk/pkg-plist
@@ -32,6 +32,7 @@ man/man1/freetalk.1.gz
@dirrmtry share/locale/en@boldquot
@dirrmtry share/locale/en@quot/LC_MESSAGES
@dirrmtry share/locale/en@quot
+@dirrmtry info
@dirrm %%DATADIR%%/extensions
@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%/examples
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0