Date: Tue, 10 Jun 2014 23:19:36 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357400 - head/misc/lingoteach Message-ID: <201406102319.s5ANJaf6080730@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Jun 10 23:19:36 2014 New Revision: 357400 URL: http://svnweb.freebsd.org/changeset/ports/357400 QAT: https://qat.redports.org/buildarchive/r357400/ Log: - Stagify - Add missing USES=libtool - Properly optionize - Fix build - Use new LIB_DEPENDS syntax Modified: head/misc/lingoteach/Makefile head/misc/lingoteach/pkg-plist Modified: head/misc/lingoteach/Makefile ============================================================================== --- head/misc/lingoteach/Makefile Tue Jun 10 23:19:30 2014 (r357399) +++ head/misc/lingoteach/Makefile Tue Jun 10 23:19:36 2014 (r357400) @@ -2,80 +2,61 @@ PORTNAME= lingoteach PORTVERSION= 0.3.9 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= misc -MASTER_SITES= SF/${PORTNAME}/OldFiles -DISTFILES= ${PORTNAME}-ui-${PORTVERSION}.tar.gz -.if defined(WITH_SOUND) -DISTFILES+= ${PORTNAME}-sound-${SOUNDV}.tar.gz -.endif +MASTER_SITES= SF/${PORTNAME}/OldFiles:src +DISTFILES= ${PORTNAME}-ui-${PORTVERSION}.tar.gz:src MAINTAINER= ports@FreeBSD.org -COMMENT= A language teaching program with sound +COMMENT= Language teaching program with sound -LIB_DEPENDS= lingoteach.3:${PORTSDIR}/textproc/liblingoteach +LIB_DEPENDS= liblingoteach.so:${PORTSDIR}/textproc/liblingoteach WRKSRC= ${WRKDIR}/${PORTNAME}-ui-${PORTVERSION} USE_GNOME= gtk20 GNU_CONFIGURE= yes -USES= gmake pkgconfig +USES= gmake pkgconfig libtool -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib `pkg-config --libs gmodule-2.0`" CPPFLAGS+= -I${LOCALBASE}/include # sound version -SOUNDV= 0.3.9 +SOUNDV= 0.3.9 -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug -.endif +PORTDATA= * +PORTDOCS= * -.if defined(WITH_SOUND) -PLIST= ${WRKDIR}/plist -.endif +OPTIONS_DEFINE= NLS SOUND DEBUG DOCS +OPTIONS_SUB= yes -NO_STAGE= yes -.include <bsd.port.pre.mk> +SOUND_DESC= Download additional sounds +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls +DEBUG_CONFIGURE_ENABLE= debug -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_DEBUG enable debugging" - @${ECHO_CMD} "" +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MSOUND} +MASTER_SITES+= SF/${PORTNAME}/${PORTNAME}-sound/${SOUNDV}:sound +DISTFILES+= ${PORTNAME}-sound-${SOUNDV}.tar.gz:sound +.endif post-patch:: -.if defined(NOPORTDOCS) - @${REINPLACE_CMD} -e 's|^SUBDIRS = intl src po data doc|SUBDIRS = src po data|g' \ +.if ${PORT_OPTIONS:MDOCS} + @${REINPLACE_CMD} -e 's|^SUBDIRS = intl src po data doc|SUBDIRS = src po data doc|g' \ ${WRKSRC}/Makefile.in .else - @${REINPLACE_CMD} -e 's|^SUBDIRS = intl src po data doc|SUBDIRS = src po data doc|g' \ + @${REINPLACE_CMD} -e 's|^SUBDIRS = intl src po data doc|SUBDIRS = src po data|g' \ ${WRKSRC}/Makefile.in .endif -.if defined(WITH_SOUND) -pre-install:: - @${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} ${.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) +.if ${PORT_OPTIONS:MSOUND} post-install:: cd ${WRKDIR}/${PORTNAME}-sound-${SOUNDV}/data; \ - ${RM} -f Make*; \ - ${CP} -R ${WRKDIR}/${PORTNAME}-sound-${SOUNDV}/data \ - ${DATADIR}; + ${RM} -f Make*; \ + ${CP} -R ${WRKDIR}/${PORTNAME}-sound-${SOUNDV}/data \ + ${STAGEDIR}${DATADIR}; .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/misc/lingoteach/pkg-plist ============================================================================== --- head/misc/lingoteach/pkg-plist Tue Jun 10 23:19:30 2014 (r357399) +++ head/misc/lingoteach/pkg-plist Tue Jun 10 23:19:36 2014 (r357400) @@ -1,36 +1,9 @@ bin/lingoteach-gtk -%%PORTDOCS%%share/doc/lingoteach/img/first-start.png -%%PORTDOCS%%share/doc/lingoteach/img/pref-general.png -%%PORTDOCS%%share/doc/lingoteach/img/pref-lesson.png -%%PORTDOCS%%share/doc/lingoteach/img/pref-module.png -%%PORTDOCS%%share/doc/lingoteach/img/pref-system.png -%%PORTDOCS%%share/doc/lingoteach/img/use-filter.png -%%PORTDOCS%%share/doc/lingoteach/img/use-multichoice.png -%%PORTDOCS%%share/doc/lingoteach/img/use-onebyone.png -%%PORTDOCS%%share/doc/lingoteach/img/use-search.png -%%PORTDOCS%%share/doc/lingoteach/index.html -%%PORTDOCS%%share/doc/lingoteach/lingoteach-conf.html -%%PORTDOCS%%share/doc/lingoteach/lingoteach-install.html -%%PORTDOCS%%share/doc/lingoteach/lingoteach-use.html -%%PORTDOCS%%share/doc/lingoteach/lingoteach.css -%%PORTDOCS%%share/doc/lingoteach/ln-legal.html -share/lingoteach/AUTHORS -share/lingoteach/COPYING -share/lingoteach/README -share/lingoteach/data/basic.xml -share/lingoteach/data/language.dtd -share/lingoteach/data/language.xml -share/lingoteach/data/lingoteach.dtd -share/lingoteach/data/rules.en.txt -share/locale/da/LC_MESSAGES/lingoteach.mo -share/locale/de/LC_MESSAGES/lingoteach.mo -share/locale/eo/LC_MESSAGES/lingoteach.mo -share/locale/fr/LC_MESSAGES/lingoteach.mo -share/locale/hu/LC_MESSAGES/lingoteach.mo -share/locale/id/LC_MESSAGES/lingoteach.mo -share/locale/pt_BR/LC_MESSAGES/lingoteach.mo -share/locale/sv/LC_MESSAGES/lingoteach.mo -@dirrm share/lingoteach/data -@dirrm share/lingoteach -%%PORTDOCS%%@dirrm share/doc/lingoteach/img -%%PORTDOCS%%@dirrm share/doc/lingoteach +%%NLS%%share/locale/da/LC_MESSAGES/lingoteach.mo +%%NLS%%share/locale/de/LC_MESSAGES/lingoteach.mo +%%NLS%%share/locale/eo/LC_MESSAGES/lingoteach.mo +%%NLS%%share/locale/fr/LC_MESSAGES/lingoteach.mo +%%NLS%%share/locale/hu/LC_MESSAGES/lingoteach.mo +%%NLS%%share/locale/id/LC_MESSAGES/lingoteach.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/lingoteach.mo +%%NLS%%share/locale/sv/LC_MESSAGES/lingoteach.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406102319.s5ANJaf6080730>