1 files changed, 30 insertions, 23 deletions

diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index 7921c52343f3..b21c22501285 100644
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@@ -1,37 +1,37 @@
 # New ports collection makefile for:   lingoteach
 # Date created:        01 September 2002
-# Whom:                Marcus vA
+# Whom:                Marcus von Appen
 #
 # $FreeBSD$
 #
 
 PORTNAME=	lingoteach
-PORTVERSION=	0.3.8
+PORTVERSION=	0.3.9
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTFILES=	${PORTNAME}-ui-${PORTVERSION}.tar.gz
 .if defined(WITH_SOUND)
-DISTFILES=	${PORTNAME}-sound-${PORTVERSION}.tar.gz \
-		${PORTNAME}-${PORTVERSION}.tar.gz
+DISTFILES+=	${PORTNAME}-sound-${SOUNDV}.tar.gz
 .endif
 
 MAINTAINER=	mva@sysfault.org
 COMMENT=	A language teaching program with sound
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	lingoteach.0:${PORTSDIR}/textproc/liblingoteach
 
-.if defined(WITH_SOUND)
-RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools
-.endif
+WRKSRC=		${WRKDIR}/${PORTNAME}-ui-${PORTVERSION}
 
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	""
 USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 
-.if defined(WITH_COMP)
-CONFIGURE_ARGS+=	--with-compression
-.endif
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+
+# sound version
+SOUNDV=			0.3.8
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
@@ -51,30 +51,37 @@ pre-everything::
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} " 		 WITH_SOUND	download additional sounds"
 	@${ECHO_CMD} "				for lingoteach"
-	@${ECHO_CMD} "		 WITH_COMP	enable compression of data"
-	@${ECHO_CMD} "				files"
 	@${ECHO_CMD} " 		 WITH_DEBUG	enable debugging"
 	@${ECHO_CMD} ""
 
+post-patch::
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's|^SUBDIRS = intl src po data doc|SUBDIRS = src po data|g' \
+	    ${WRKSRC}/Makefile.in
+.else
+	@${REINPLACE_CMD} -e 's|^SUBDIRS = intl src po data doc|SUBDIRS = src po data doc|g' \
+	    ${WRKSRC}/Makefile.in
+.endif
+
 .if defined(WITH_SOUND)
 pre-install::
-	${CAT} pkg-plist | ${SED} '/@dirrm/d' > ${WRKDIR}/plist; \
-	cd ${WRKDIR}/${PORTNAME}-sound-${PORTVERSION}/data; \
-	${FIND} . -type f \! -name "Make*" | cut -c2- | \
+	@${CAT} pkg-plist | ${SED} '/@dirrm/d' > ${PLIST}; \
+	cd ${WRKDIR}/${PORTNAME}-sound-${SOUNDV}/data; \
+	${FIND} . -type f \! -name "Make*" | ${CUT} -c2- | \
 	${SED} 's|^|${DATADIR:S,${PREFIX}/,,}/data|' \
 	| ${SORT} >> ${PLIST}; \
-	${CAT} ${WRKDIR}/../pkg-plist | ${GREP} '@dirrm include' >> ${PLIST}; \
-	cd ${WRKDIR}/${PORTNAME}-sound-${PORTVERSION}/data; \
-	${FIND} . -type d | cut -c2- | ${SED} \
-	's|^|@dirrm ${DATADIR:S,${PREFIX}/,,}/data|' | ${SORT} -r >> ${PLIST};
+	${CAT} ${.CURDIR}/pkg-plist | ${SED} '/%%PORTDOCS%%@dirrm/!d' >> ${PLIST}; \
+	cd ${WRKDIR}/${PORTNAME}-sound-${SOUNDV}/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::
-	cd ${WRKDIR}/${PORTNAME}-sound-${PORTVERSION}/data; \
+	cd ${WRKDIR}/${PORTNAME}-sound-${SOUNDV}/data; \
 	${RM} -f Make*; \
-	${CP} -R ${WRKDIR}/${PORTNAME}-sound-${PORTVERSION}/data \
+	${CP} -R ${WRKDIR}/${PORTNAME}-sound-${SOUNDV}/data \
 	${DATADIR};
 .endif