From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Mar 31 18:40:04 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 12513320 for ; Mon, 31 Mar 2014 18:40:04 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E76093E7 for ; Mon, 31 Mar 2014 18:40:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s2VIe3gf004972 for ; Mon, 31 Mar 2014 18:40:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2VIe3Ae004971; Mon, 31 Mar 2014 18:40:03 GMT (envelope-from gnats) Resent-Date: Mon, 31 Mar 2014 18:40:03 GMT Resent-Message-Id: <201403311840.s2VIe3Ae004971@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ACD4DFFC for ; Mon, 31 Mar 2014 18:30:36 +0000 (UTC) Received: from omta01.auone-net.jp (mail-or1-f17.auone-net.jp [106.187.231.17]) by mx1.freebsd.org (Postfix) with ESMTP id 585AB356 for ; Mon, 31 Mar 2014 18:30:36 +0000 (UTC) Received: from coppermine.my.domain (ZT030154.ppp.dion.ne.jp [59.128.30.154]) by omta01.auone-net.jp (au one net mail) with ESMTP id 237F998000F for ; Tue, 1 Apr 2014 03:30:33 +0900 (JST) Message-Id: <20140401032618.2142a1bc6d821df4102a499b@yahoo.com> Date: Tue, 1 Apr 2014 03:26:18 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/188146: games/tuxtype: Fix build on -current X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Mar 2014 18:40:04 -0000 >Number: 188146 >Category: ports >Synopsis: games/tuxtype: Fix build on -current >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Mar 31 18:40:03 UTC 2014 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p7 i386 >Organization: >Environment: >Description: - Fix build on -current >How-To-Repeat: >Fix: diff -urN /usr/ports/games/tuxtype/Makefile games/tuxtype/Makefile --- /usr/ports/games/tuxtype/Makefile 2013-11-06 22:00:56.000000000 +0900 +++ games/tuxtype/Makefile 2014-04-01 00:00:00.000000000 +0900 @@ -11,21 +11,17 @@ ${T4K_DISTFILE}:t4k_common MAINTAINER= ports@FreeBSD.org -COMMENT= An educational typing tutor starring Tux the Linux Penguin +COMMENT= Educational typing tutor starring Tux the Linux Penguin LICENSE= GPLv3 # (or later) BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed -OPTIONS_DEFINE= NLS SVG DOCS -OPTIONS_DEFAULT= SVG - WRKSRC= ${WRKDIR}/${PORTNAME}_w_fonts-${PORTVERSION} +USES= gmake iconv perl5 pkgconfig USE_GNOME= libxml2 USE_SDL= image mixer net pango sdl -USES= iconv perl5 pkgconfig -USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= T4K_COMMON_CFLAGS="-I${T4K_WRKSRC}/src" \ T4K_COMMON_LIBS="${T4K_WRKSRC}/src/.libs/libt4k_common.a" \ @@ -35,40 +31,33 @@ -DHAVE_ALPHASORT -DHAVE_SCANDIR -DHAVE_FSYNC -DICONV_CONST="" LDFLAGS+= $$(pkg-config --libs SDL_Pango) -L${LOCALBASE}/lib ${ICONV_LIB} +OPTIONS_DEFINE= DOCS NLS SVG +OPTIONS_DEFAULT= SVG +OPTIONS_SUB= yes + +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls +SVG_USE_GNOME= librsvg2 +SVG_CONFIGURE_WITH= rsvg + T4K_NAME= t4k_common T4K_VERSION= 0.1.1 T4K_DISTFILE= ${T4K_NAME}-${T4K_VERSION}${EXTRACT_SUFX} T4K_WRKSRC= ${WRKDIR}/${T4K_NAME}-${T4K_VERSION} -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MSVG} -USE_GNOME+= librsvg2 -.else -CONFIGURE_ARGS+=--without-rsvg -.endif - -# use multiple make jobs for T4K_WRKSRC -_make_jobs= -j${MAKE_JOBS_NUMBER} - post-extract: @${LN} -sf ${T4K_WRKSRC} ${WRKDIR}/${T4K_NAME} post-patch: -.for file in convert_utf.h mysetenv.h practice.c - @${ECHO_CMD} >> ${WRKSRC}/src/${file} +.for i in convert_utf.h mysetenv.h practice.c + @${ECHO_CMD} >> ${WRKSRC}/src/${i} .endfor @${REINPLACE_CMD} -e \ - '/doc[[:space:]]/d' ${WRKSRC}/Makefile.in + '/-R$$found_dir/s|^|#|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + '/[[:blank:]]VERSION/d' ${WRKSRC}/config.h.in + @${REINPLACE_CMD} -e \ + '/doc[[:blank:]]/d' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ 's|/bin/bash|/bin/sh| ; \ s|^sed |gsed |' ${WRKSRC}/data/scripts/sed-linux.sh @@ -86,18 +75,16 @@ CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}") pre-build: - @(cd ${T4K_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - ${MAKEFILE} ${_make_jobs} ${ALL_TARGET}) + @(cd ${T4K_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ + ${MAKEFILE} -j${MAKE_JOBS_NUMBER} ${ALL_TARGET}) post-install: - @${ECHO_CMD} -n > ${ETCDIR}/.keep_me -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} -.for file in AUTHORS ChangeLog OFL README TODO - ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} + @${ECHO_CMD} -n > ${STAGEDIR}${ETCDIR}/.keep_me + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in AUTHORS ChangeLog OFL README TODO + (cd ${WRKSRC}/doc && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor - @${MKDIR} ${DOCSDIR}/en - ${INSTALL_DATA} ${WRKSRC}/doc/en/*.html ${DOCSDIR}/en -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR}/en + (cd ${WRKSRC}/doc/en && ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}/en) .include >Release-Note: >Audit-Trail: >Unformatted: