From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Feb 22 18:30:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7F957D6D for ; Fri, 22 Feb 2013 18:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 71270159 for ; Fri, 22 Feb 2013 18:30:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1MIU1IY075542 for ; Fri, 22 Feb 2013 18:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1MIU1Zr075541; Fri, 22 Feb 2013 18:30:01 GMT (envelope-from gnats) Date: Fri, 22 Feb 2013 18:30:01 GMT Message-Id: <201302221830.r1MIU1Zr075541@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Cc: From: nemysis Subject: Re: ports/173347: [MAINTAINER] games/BillardGL: Changed Makefile, added Desktop entries, icons, removed all Notes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: nemysis List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Feb 2013 18:30:01 -0000 The following reply was made to PR ports/173347; it has been noted by GNATS. From: nemysis To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/173347: [MAINTAINER] games/BillardGL: Changed Makefile, added Desktop entries, icons, removed all Notes Date: Fri, 22 Feb 2013 19:26:48 +0100 --MP_/9IEdY_ByDc9YW5S4yeSArDf Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Changed DESKTOP_ENTRIES= --MP_/9IEdY_ByDc9YW5S4yeSArDf Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=BillardGL.diff ===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/games/BillardGL/Makefile ./Makefile --- /usr/ports/games/BillardGL/Makefile 2013-01-14 17:55:24.000000000 +0100 +++ ./Makefile 2013-02-22 19:14:33.000000000 +0100 @@ -7,12 +7,12 @@ PORTNAME= BillardGL PORTVERSION= 1.75 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}/ \ +MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}/:game \ SF/nemysisfreebsdp/:icons -DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ - ${PORTNAME}-LP-010.zip \ +DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:game \ + ${PORTNAME}-LP-010.zip:game \ ${PORTNAME}_icons.tar.gz:icons DIST_SUBDIR= ${PORTNAME:L} @@ -30,47 +30,53 @@ USE_XORG= xmu xext x11 xi USE_GL= glut -PLIST_FILES= bin/${PORTNAME} \ - share/pixmaps/${PORTNAME}_48.png \ - share/pixmaps/${PORTNAME}_64.png \ - share/pixmaps/${PORTNAME}_72.png \ - share/pixmaps/${PORTNAME}_96.png - -PORTDATA= * PORTDOCS= README +INSTALLS_ICONS= yes +ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 + +DESKTOP_ENTRIES="BillardGL" "${COMMENT}" \ + "${PREFIX}/share/pixmaps/${PORTNAME}.png" \ + "${PORTNAME}" "Game;ArcadeGame;" false + OPTIONS_DEFINE= LANG -LANG_DESC= Install additional Language -OPTIONS_DEFAULT= LANG +OPTIONS_DEFAULT=LANG +LANG_DESC= Install Language .include +.if ${PORT_OPTIONS:MLANG} +PLIST_SUB+= LANG="" +.else +PLIST_SUB+= LANG="@comment " +.endif + post-patch: -# Fix data location @${REINPLACE_CMD} -e 's|/usr/share/BillardGL/|${DATADIR}/|' ${WRKSRC}/Namen.h do-install: -# Executable - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ -# Data -# ${MKDIR} ${DATADIR} -.for d in Texturen lang +.for d in Texturen @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR}) .endfor -# Pixmaps - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}*.png ${PREFIX}/share/pixmaps +post-install: +.for s in ${ICON_SIZES} + ${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ + ${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png +.endfor + ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/ -# Documentation .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif -# Additional Language .if ${PORT_OPTIONS:MLANG} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-LP-010/*.lang ${DATADIR}/lang/ + @${MKDIR} ${DATADIR}/lang + @${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-LP-010/*.lang ${DATADIR}/lang/ .endif .include diff -ruN --exclude=CVS /usr/ports/games/BillardGL/distinfo ./distinfo --- /usr/ports/games/BillardGL/distinfo 2013-01-14 17:55:24.000000000 +0100 +++ ./distinfo 2012-11-04 11:47:52.000000000 +0100 @@ -2,5 +2,5 @@ SIZE (billardgl/BillardGL-1.75.tar.gz) = 736295 SHA256 (billardgl/BillardGL-LP-010.zip) = a1325a0ed9b0dc3e2cbf8acebe4f7c4caf4183547b777b7543ad61e1e6e07cf6 SIZE (billardgl/BillardGL-LP-010.zip) = 232940 -SHA256 (billardgl/BillardGL_icons.tar.gz) = f4d5812c32f57f81e610962b68941d79ff4469f25ed21bc0ff5a50b1c3c5b446 -SIZE (billardgl/BillardGL_icons.tar.gz) = 25088 +SHA256 (billardgl/BillardGL_icons.tar.gz) = bce61c00306d18b40216e99df1a782ffe1c93bd70ccba3f55ee9e8c4b970b6c4 +SIZE (billardgl/BillardGL_icons.tar.gz) = 38400 diff -ruN --exclude=CVS /usr/ports/games/BillardGL/pkg-plist ./pkg-plist --- /usr/ports/games/BillardGL/pkg-plist 1970-01-01 01:00:00.000000000 +0100 +++ ./pkg-plist 2012-11-04 13:03:21.000000000 +0100 @@ -0,0 +1,134 @@ +bin/BillardGL +%%DATADIR%%/Texturen/1/1.bmp +%%DATADIR%%/Texturen/1/10.bmp +%%DATADIR%%/Texturen/1/11.bmp +%%DATADIR%%/Texturen/1/12.bmp +%%DATADIR%%/Texturen/1/13.bmp +%%DATADIR%%/Texturen/1/14.bmp +%%DATADIR%%/Texturen/1/15.bmp +%%DATADIR%%/Texturen/1/2.bmp +%%DATADIR%%/Texturen/1/3.bmp +%%DATADIR%%/Texturen/1/4.bmp +%%DATADIR%%/Texturen/1/5.bmp +%%DATADIR%%/Texturen/1/6.bmp +%%DATADIR%%/Texturen/1/7.bmp +%%DATADIR%%/Texturen/1/8.bmp +%%DATADIR%%/Texturen/1/9.bmp +%%DATADIR%%/Texturen/1/a00.bmp +%%DATADIR%%/Texturen/1/a1.bmp +%%DATADIR%%/Texturen/1/a10.bmp +%%DATADIR%%/Texturen/1/a11.bmp +%%DATADIR%%/Texturen/1/a12.bmp +%%DATADIR%%/Texturen/1/a13.bmp +%%DATADIR%%/Texturen/1/a14.bmp +%%DATADIR%%/Texturen/1/a15.bmp +%%DATADIR%%/Texturen/1/a2.bmp +%%DATADIR%%/Texturen/1/a3.bmp +%%DATADIR%%/Texturen/1/a4.bmp +%%DATADIR%%/Texturen/1/a5.bmp +%%DATADIR%%/Texturen/1/a6.bmp +%%DATADIR%%/Texturen/1/a7.bmp +%%DATADIR%%/Texturen/1/a8.bmp +%%DATADIR%%/Texturen/1/a9.bmp +%%DATADIR%%/Texturen/1/aalpha.bmp +%%DATADIR%%/Texturen/1/aalpha2.bmp +%%DATADIR%%/Texturen/1/buchstaben.bmp +%%DATADIR%%/Texturen/1/buchstabenalpha.bmp +%%DATADIR%%/Texturen/1/dreizehn.bmp +%%DATADIR%%/Texturen/1/filzkachel.bmp +%%DATADIR%%/Texturen/1/halbe.bmp +%%DATADIR%%/Texturen/1/holz.bmp +%%DATADIR%%/Texturen/1/logo.bmp +%%DATADIR%%/Texturen/1/volle.bmp +%%DATADIR%%/Texturen/2/1.bmp +%%DATADIR%%/Texturen/2/10.bmp +%%DATADIR%%/Texturen/2/11.bmp +%%DATADIR%%/Texturen/2/12.bmp +%%DATADIR%%/Texturen/2/13.bmp +%%DATADIR%%/Texturen/2/14.bmp +%%DATADIR%%/Texturen/2/15.bmp +%%DATADIR%%/Texturen/2/2.bmp +%%DATADIR%%/Texturen/2/3.bmp +%%DATADIR%%/Texturen/2/4.bmp +%%DATADIR%%/Texturen/2/5.bmp +%%DATADIR%%/Texturen/2/6.bmp +%%DATADIR%%/Texturen/2/7.bmp +%%DATADIR%%/Texturen/2/8.bmp +%%DATADIR%%/Texturen/2/9.bmp +%%DATADIR%%/Texturen/2/aalpha2.bmp +%%DATADIR%%/Texturen/2/buchstaben.bmp +%%DATADIR%%/Texturen/2/buchstabenalpha.bmp +%%DATADIR%%/Texturen/2/filzkachel.bmp +%%DATADIR%%/Texturen/2/halbe.bmp +%%DATADIR%%/Texturen/2/holz.bmp +%%DATADIR%%/Texturen/2/volle.bmp +%%DATADIR%%/Texturen/4/1.bmp +%%DATADIR%%/Texturen/4/10.bmp +%%DATADIR%%/Texturen/4/11.bmp +%%DATADIR%%/Texturen/4/12.bmp +%%DATADIR%%/Texturen/4/13.bmp +%%DATADIR%%/Texturen/4/14.bmp +%%DATADIR%%/Texturen/4/15.bmp +%%DATADIR%%/Texturen/4/2.bmp +%%DATADIR%%/Texturen/4/3.bmp +%%DATADIR%%/Texturen/4/4.bmp +%%DATADIR%%/Texturen/4/5.bmp +%%DATADIR%%/Texturen/4/6.bmp +%%DATADIR%%/Texturen/4/7.bmp +%%DATADIR%%/Texturen/4/8.bmp +%%DATADIR%%/Texturen/4/9.bmp +%%DATADIR%%/Texturen/4/holz.bmp +%%DATADIR%%/Texturen/8/1.bmp +%%DATADIR%%/Texturen/8/10.bmp +%%DATADIR%%/Texturen/8/11.bmp +%%DATADIR%%/Texturen/8/12.bmp +%%DATADIR%%/Texturen/8/13.bmp +%%DATADIR%%/Texturen/8/14.bmp +%%DATADIR%%/Texturen/8/15.bmp +%%DATADIR%%/Texturen/8/2.bmp +%%DATADIR%%/Texturen/8/3.bmp +%%DATADIR%%/Texturen/8/4.bmp +%%DATADIR%%/Texturen/8/5.bmp +%%DATADIR%%/Texturen/8/6.bmp +%%DATADIR%%/Texturen/8/7.bmp +%%DATADIR%%/Texturen/8/8.bmp +%%DATADIR%%/Texturen/8/9.bmp +%%DATADIR%%/Texturen/8/holz.bmp +%%LANG%%%%DATADIR%%/lang/900.lang +%%LANG%%%%DATADIR%%/lang/901.lang +%%LANG%%%%DATADIR%%/lang/903.lang +%%LANG%%%%DATADIR%%/lang/904.lang +%%LANG%%%%DATADIR%%/lang/905.lang +%%LANG%%%%DATADIR%%/lang/906.lang +%%LANG%%%%DATADIR%%/lang/907.lang +%%LANG%%%%DATADIR%%/lang/908.lang +%%LANG%%%%DATADIR%%/lang/909.lang +%%LANG%%%%DATADIR%%/lang/910.lang +%%LANG%%%%DATADIR%%/lang/911.lang +%%LANG%%%%DATADIR%%/lang/912.lang +%%LANG%%%%DATADIR%%/lang/999.lang +share/icons/hicolor/32x32/apps/BillardGL.png +share/icons/hicolor/48x48/apps/BillardGL.png +share/icons/hicolor/64x64/apps/BillardGL.png +share/icons/hicolor/72x72/apps/BillardGL.png +share/icons/hicolor/96x96/apps/BillardGL.png +share/pixmaps/BillardGL.png +@dirrmtry share/icons/hicolor/96x96/apps +@dirrmtry share/icons/hicolor/96x96 +@dirrmtry share/icons/hicolor/72x72/apps +@dirrmtry share/icons/hicolor/72x72 +@dirrmtry share/icons/hicolor/64x64/apps +@dirrmtry share/icons/hicolor/64x64 +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +%%LANG%%@dirrm %%DATADIR%%/lang +@dirrm %%DATADIR%%/Texturen/8 +@dirrm %%DATADIR%%/Texturen/4 +@dirrm %%DATADIR%%/Texturen/2 +@dirrm %%DATADIR%%/Texturen/1 +@dirrm %%DATADIR%%/Texturen +@dirrm %%DATADIR%% ===> Done --MP_/9IEdY_ByDc9YW5S4yeSArDf--