Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 04 Nov 2012 05:06:21 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        jgh@FreeBSD.org
Subject:   ports/173347: [MAINTAINER] games/BillardGL: Changed Makefile, added Desktop entries, icons, removed all Notes
Message-ID:  <20121104040625.1E85BE27@hub.freebsd.org>
Resent-Message-ID: <201211040410.qA44A19L051001@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         173347
>Category:       ports
>Synopsis:       [MAINTAINER] games/BillardGL: Changed Makefile, added Desktop entries, icons, removed all Notes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 04 04:10:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

Makefile changed:
 PLIST_FILES=
+INSTALLS_ICONS=	yes
+ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
+DESKTOP_ENTRIES=
+post-install:

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:

portlint -A
looks fine.

port test: clean

>Fix:

--- BillardGL-1.75_9.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/BillardGL/Makefile ./Makefile
--- /usr/ports/games/BillardGL/Makefile	2012-09-10 22:48:10.000000000 +0200
+++ ./Makefile	2012-11-04 05:00:00.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}
 
@@ -31,14 +31,22 @@
 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
+		share/pixmaps/${PORTNAME}.png \
+		share/icons/hicolor/32x32/apps/${PORTNAME}.png \
+		share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+		share/icons/hicolor/64x64/apps/${PORTNAME}.png \
+		share/icons/hicolor/72x72/apps/${PORTNAME}.png \
+		share/icons/hicolor/96x96/apps/${PORTNAME}.png
 
 PORTDATA=	*
 PORTDOCS=	README
 
+INSTALLS_ICONS=	yes
+ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
+
+DESKTOP_ENTRIES="BillardGL" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
+
 OPTIONS_DEFINE=	LANG
 LANG_DESC=	Install additional Language
 OPTIONS_DEFAULT=	LANG
@@ -46,31 +54,30 @@
 .include <bsd.port.options.mk>
 
 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
 
-# Data
-#	${MKDIR} ${DATADIR}
 .for d in Texturen lang
 	@(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/
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-LP-010/*.lang ${DATADIR}/lang
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/BillardGL/distinfo ./distinfo
--- /usr/ports/games/BillardGL/distinfo	2012-09-10 22:48:10.000000000 +0200
+++ ./distinfo	2012-11-04 04:57:08.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
--- BillardGL-1.75_9.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121104040625.1E85BE27>