Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Jun 2015 22:53:28 +0000 (UTC)
From:      Alberto Villa <avilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r391013 - head/accessibility/speech-dispatcher
Message-ID:  <201506302253.t5UMrSIg084318@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avilla
Date: Tue Jun 30 22:53:28 2015
New Revision: 391013
URL: https://svnweb.freebsd.org/changeset/ports/391013

Log:
  accessibility/speech-dispatcher: remove NLS option
  
  Building the port without NLS failed as the configure script still
  required the gettext tools.
  
  PR:		201221

Modified:
  head/accessibility/speech-dispatcher/Makefile
  head/accessibility/speech-dispatcher/pkg-plist

Modified: head/accessibility/speech-dispatcher/Makefile
==============================================================================
--- head/accessibility/speech-dispatcher/Makefile	Tue Jun 30 21:51:56 2015	(r391012)
+++ head/accessibility/speech-dispatcher/Makefile	Tue Jun 30 22:53:28 2015	(r391013)
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libdotconf.so:${PORTSDIR}/d
 		libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 USE_GNOME=	glib20 intltool
-USES=		alias gmake pathfix pkgconfig libtool
+USES=		alias gettext gmake pathfix pkgconfig libtool
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -33,9 +33,9 @@ ETCFILES=	clients/emacs.conf modules/pic
 
 PORTDOCS=	ANNOUNCE AUTHORS ChangeLog FAQ NEWS README TODO
 
-INFO=		spd-say speech-dispatcher ssip
+INFO=		spd-say speech-dispatcher speech-dispatcher-cs ssip
 
-OPTIONS_DEFINE=	ALSA AO DOCS ESPEAK FESTIVAL FLITE NAS NLS \
+OPTIONS_DEFINE=	ALSA AO DOCS ESPEAK FESTIVAL FLITE NAS \
 		PULSEAUDIO PYTHON
 OPTIONS_DEFAULT=ESPEAK
 OPTIONS_SUB=	yes
@@ -61,8 +61,6 @@ FLITE_CONFIGURE_WITH=	flite
 NAS_LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas
 NAS_CONFIGURE_WITH=	nas
 
-NLS_USES=		gettext
-
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=pulse
 
@@ -71,19 +69,9 @@ PYTHON_USES=		python:3
 PYTHON_USE=		PYTHON=py3kplist
 PYTHON_CONFIGURE_ENABLE=python
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-INFO+=		speech-dispatcher-cs
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/SUBDIRS/ s/tests//' \
 		${WRKSRC}/src/Makefile.in
-.if ! ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e '/SUBDIRS/ s/po//' \
-		${WRKSRC}/Makefile.in
-.endif
 
 post-install:
 .for f in ${ETCFILES}
@@ -93,8 +81,5 @@ post-install:
 	@${RMDIR} ${STAGEDIR}${DATADIR} || ${TRUE}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.if ! ${PORT_OPTIONS:MNLS}
-	@${RM} -f ${STAGEDIR}${PREFIX}/${INFO_PATH}/speech-dispatcher-cs.info
-.endif
 
 .include <bsd.port.mk>

Modified: head/accessibility/speech-dispatcher/pkg-plist
==============================================================================
--- head/accessibility/speech-dispatcher/pkg-plist	Tue Jun 30 21:51:56 2015	(r391012)
+++ head/accessibility/speech-dispatcher/pkg-plist	Tue Jun 30 22:53:28 2015	(r391013)
@@ -64,7 +64,7 @@ lib/speech-dispatcher/spd_oss.so
 %%PULSEAUDIO%%lib/speech-dispatcher/spd_pulse.a
 %%PULSEAUDIO%%lib/speech-dispatcher/spd_pulse.so
 libdata/pkgconfig/speech-dispatcher.pc
-%%NLS%%share/locale/cs/LC_MESSAGES/speech-dispatcher.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/speech-dispatcher.mo
+share/locale/cs/LC_MESSAGES/speech-dispatcher.mo
+share/locale/hu/LC_MESSAGES/speech-dispatcher.mo
 share/sounds/speech-dispatcher/dummy-message.wav
 %%PYTHON%%share/sounds/speech-dispatcher/test.wav



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