1. added WITH_SOUND

2. make portlint happy

PR:		42733 (1)
Submitted by:	maintainer

4 files changed, 72 insertions, 29 deletions

diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index 5166acde5d58..891571b563a0 100644
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@@ -5,28 +5,73 @@
 # $FreeBSD$
 #
 
-PORTNAME=      lingoteach
-PORTVERSION=   0.3.7
-CATEGORIES=    misc
-MASTER_SITES=  http://unc.dl.sourceforge.net/sourceforge/lingoteach/
+PORTNAME=	lingoteach
+PORTVERSION=	0.3.7
+PORTREVISION=	1
+CATEGORIES=	misc
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+.if defined(WITH_SOUND)
+DISTFILES=	${PORTNAME}-sound-${PORTVERSION}.tar.gz \
+		${PORTNAME}-${PORTVERSION}.tar.gz
+.endif
 
-MAINTAINER=    mva121@gmx.net
+MAINTAINER=	mva121@gmx.net
 
-BUILD_DEPENDS= gtk-query-immodules-2.0:${PORTSDIR}/x11-toolkits/gtk20:install \
-	       xml2-config:${PORTSDIR}/textproc/libxml2:install
-LIB_DEPENDS=   xml2.5:${PORTSDIR}/textproc/libxml2:install \
-	       gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20:install
+BUILD_DEPENDS=	gtk-query-immodules-2.0:${PORTSDIR}/x11-toolkits/gtk20:install \
+		xml2-config:${PORTSDIR}/textproc/libxml2:install
+LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2:install \
+		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20:install
+.if defined(WITH_SOUND)
+RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools
+.endif
 
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET=
-USE_GMAKE=     yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	""
+USE_GMAKE=	yes
 
+.if defined(WITH_SOUND)
+PLIST=		${WRKDIR}/plist
+.endif
+
+SORT?=		/usr/bin/sort
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITH_SOUND)
+pre-extract::
+	@${ECHO_CMD} "************************************************"
+	@${ECHO_CMD} "*                                              *"
+	@${ECHO_CMD} "* For Sound in Lingoteach, type Ctrl-C now and *"
+	@${ECHO_CMD} "*            define WITH_SOUND=yes             *"
+	@${ECHO_CMD} "*                                              *"
+	@${ECHO_CMD} "************************************************"
+	@sleep 3
+.endif
+
+.if defined(WITH_SOUND)
+pre-install::
+	cd ${WRKSRC}/src; ${ECHO_CMD} \
+	"bin/`find . -type f -perm 755 |cut -c3-`" > ${PLIST}; \
+	cd ${WRKDIR}/${PORTNAME}-sound-${PORTVERSION}/data; \
+	${FIND} . -type f \! -name "Make*" | cut -c2- | \
+	${SED} 's|^|${DATADIR:S,${PREFIX}/,,}/data|' \
+	| ${SORT} >> ${PLIST}; \
+	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/data; \
+	${FIND} . -type f \! -name "Make*" | cut -c2- | ${SED} \
+	's|^|${DATADIR:S,${PREFIX}/,,}/data|' | ${SORT} >> ${PLIST}; \
+	cd ${WRKDIR}/${PORTNAME}-sound-${PORTVERSION}/data; \
+	${FIND} . -type d | cut -c2- | ${SED} \
+	's|^|@dirrm ${DATADIR:S,${PREFIX}/,,}/data|' | ${SORT} -r >> ${PLIST};
+	${ECHO_CMD} "@dirrm ${DATADIR:S,${PREFIX}/,,}" >> ${PLIST};
+.endif
+
+.if defined(WITH_SOUND)
 post-install::
-	@${ECHO_MSG} "--------------------------------------------------------"
-	@${ECHO_MSG} " If you want the sound snippets too, go to the projects "
-	@${ECHO_MSG} " homepage - http://lingoteach.org, fetch the tar ball   "
-	@${ECHO_MSG} " of the sound snippets and copy the content of data     "
-	@${ECHO_MSG} " to $PREFIX/share/lingoteach/data.                      "
-	@${ECHO_MSG} "--------------------------------------------------------"
-
-.include <bsd.port.mk>
+	cd ${WRKDIR}/${PORTNAME}-sound-${PORTVERSION}/data; \
+	${RM} Make*; \
+	${CP} -R ${WRKDIR}/${PORTNAME}-sound-${PORTVERSION}/data \
+	${DATADIR};
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/misc/lingoteach/distinfo b/misc/lingoteach/distinfo
index 2942429e9009..ace84341109d 100644
--- a/misc/lingoteach/distinfo
+++ b/misc/lingoteach/distinfo
@@ -1 +1,2 @@
+MD5 (lingoteach-sound-0.3.7.tar.gz) = 13f008b67161fef001258582986b0997
 MD5 (lingoteach-0.3.7.tar.gz) = ac128bbf49b8e70fbe296aa9f71c5baf
diff --git a/misc/lingoteach/pkg-comment b/misc/lingoteach/pkg-comment
index 0f613d89442b..2d693d43c5e6 100644
--- a/misc/lingoteach/pkg-comment
+++ b/misc/lingoteach/pkg-comment
@@ -1 +1 @@
-A language teaching program
+A language teaching program with sound
diff --git a/misc/lingoteach/pkg-descr b/misc/lingoteach/pkg-descr
index a06fbbbf0e6d..af6d5cdf3500 100644
--- a/misc/lingoteach/pkg-descr
+++ b/misc/lingoteach/pkg-descr
@@ -1,12 +1,9 @@
 This is a port of lingoteach, which aims to be a language
-teaching program. Until now, chinese, german, spanish and
-english are supported. You ca add your own lessons by using
-an integrated editor or editing the xml-files yourself.
-Different types of learning are available for actually 825
-words and sentences.
-For the soundsnippets, you have to download the sound tarball
-separately ad copy the content of its data-dir to
-$PREFIX/lingoteach/data.
+teaching program. Until now nearly 17 languages are supported, 
+some with sound of native speakers. You can add your own lessons
+by using an integrated editor or edit the XML-files manually.
+Different types of learning are available for many words and
+sentences.
 
 WWW: http://www.lingoteach.org