From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 23 09:20:10 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9875B37B401 for ; Wed, 23 Apr 2003 09:20:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 274AC43FAF for ; Wed, 23 Apr 2003 09:20:10 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h3NGK9Up023765 for ; Wed, 23 Apr 2003 09:20:09 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h3NGK9TB023761; Wed, 23 Apr 2003 09:20:09 -0700 (PDT) Date: Wed, 23 Apr 2003 09:20:09 -0700 (PDT) Message-Id: <200304231620.h3NGK9TB023761@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Marcus von Appen Subject: Re: ports/51255: [Maintainer-Update]: misc/lingoteach X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Marcus von Appen List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2003 16:20:10 -0000 The following reply was made to PR ports/51255; it has been noted by GNATS. From: Marcus von Appen To: freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/51255: [Maintainer-Update]: misc/lingoteach Date: Wed, 23 Apr 2003 18:18:37 +0200 --=.54DHER0T70RCN) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Please use the following diff, the other one has got a small error. Sorry. ---- diff -Nur lingoteach/Makefile lingoteach.new/Makefile --- lingoteach/Makefile Thu Apr 17 04:07:54 2003 +++ lingoteach.new/Makefile Wed Apr 23 17:59:05 2003 @@ -6,8 +6,7 @@ # PORTNAME= lingoteach -PORTVERSION= 0.3.7 -PORTREVISION= 2 +PORTVERSION= 0.3.8 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -30,6 +29,14 @@ CONFIGURE_TARGET= "" USE_GMAKE= yes +.if defined(WITH_COMP) +CONFIGURE_ARGS+= --with-compression +.endif + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug +.endif + .if defined(WITH_SOUND) PLIST= ${WRKDIR}/plist .endif @@ -38,28 +45,25 @@ .include -.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 +pre-everything:: + @${ECHO_CMD} "" + @${ECHO_CMD} " Available options for lingoteach:" + @${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} "" .if defined(WITH_SOUND) pre-install:: - cd ${WRKSRC}/src; ${ECHO_CMD} \ - "bin/`find . -type f -perm 755 |cut -c3-`" > ${PLIST}; \ + ${CAT} pkg-plist | ${SED} '/@dirrm/d' > ${WRKDIR}/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}; \ + ${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};@@ -69,7 +73,7 @@ .if defined(WITH_SOUND) post-install:: cd ${WRKDIR}/${PORTNAME}-sound-${PORTVERSION}/data; \ - ${RM} Make*; \ + ${RM} -f Make*; \ ${CP} -R ${WRKDIR}/${PORTNAME}-sound-${PORTVERSION}/data \ ${DATADIR}; .endif diff -Nur lingoteach/distinfo lingoteach.new/distinfo --- lingoteach/distinfo Thu Sep 19 22:27:06 2002 +++ lingoteach.new/distinfo Wed Apr 23 17:58:51 2003 @@ -1,2 +1,2 @@ -MD5 (lingoteach-sound-0.3.7.tar.gz) = 13f008b67161fef001258582986b0997 -MD5 (lingoteach-0.3.7.tar.gz) = ac128bbf49b8e70fbe296aa9f71c5baf +MD5 (lingoteach-sound-0.3.8.tar.gz) = 981f0b5bfaf84b7dbf31c0a826130cf0 +MD5 (lingoteach-0.3.8.tar.gz) = a78626a2c5ec2c24b2270bd0a75f949d diff -Nur lingoteach/pkg-plist lingoteach.new/pkg-plist --- lingoteach/pkg-plist Wed Sep 11 16:38:15 2002 +++ lingoteach.new/pkg-plist Wed Apr 23 17:58:51 2003 @@ -1,8 +1,22 @@ -bin/lingoteach -share/lingoteach/data/rules.en.txt -share/lingoteach/data/lingoteach.dtd +bin/lingoteach-gtk +include/lingoteach/conf.h +include/lingoteach/data.h +include/lingoteach/iterator.h +include/lingoteach/language.h +include/lingoteach/lesson.h +include/lingoteach/meaning.h +include/lingoteach/sound.h +info/lingoteach.info +lib/liblingoteach.a +lib/liblingoteach.la +lib/liblingoteach.so +lib/liblingoteach.so.0 +share/lingoteach/data/basic.xml +share/lingoteach/data/freedict.xml share/lingoteach/data/language.dtd share/lingoteach/data/language.xml -share/lingoteach/data/basic.xml +share/lingoteach/data/lingoteach.dtd +share/lingoteach/data/rules.en.txt @dirrm share/lingoteach/data @dirrm share/lingoteach +@dirrm include/lingoteach ----- Thanks to adam for his advice. Regards Marcus --=.54DHER0T70RCN) Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+przro/JpszXavhwRAjL5AJ9Ft7FwYuMX7dFTs4hTfmI7lwMGMwCgiYn9 lm5bsqZg5DMQr2x96m5FYz4= =eNb1 -----END PGP SIGNATURE----- --=.54DHER0T70RCN)--