ports/161545: [patch] fix installing only server to games/openttd

Ilya A. Arkhipov micro at heavennet.ru
Thu Oct 13 13:50:10 UTC 2011


>Number:         161545
>Category:       ports
>Synopsis:       [patch] fix installing only server to games/openttd
>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:   Thu Oct 13 13:50:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Ilya A. Arkhipov
>Release:        FreeBSD 10.0-CURRENT
>Organization:
Luxoft
>Environment:
FreeBSD micro 10.0-CURRENT FreeBSD 10.0-CURRENT #3 r226184: Mon Oct 10 12:44:23 MSK 2011     root at micro:/usr/obj/usr/src/sys/MICROKERNEL  amd64
>Description:
Fix installing only server to openttd, now we not installing icons for game.
Also little fix variable for portlint.
>How-To-Repeat:
Try install openttd -D WITH_DEDICATED_SERVER_ONLY
>Fix:
in attach or http://micro.heavennet.ru/ports/openttd/openttd_1.1.3_fix.txt

Patch attached with submission follows:

diff -Nru openttd_1.1.3/Makefile openttd/Makefile
--- openttd_1.1.3/Makefile	2011-10-13 17:35:49.617131202 +0400
+++ openttd/Makefile	2011-10-13 17:37:07.124752240 +0400
@@ -28,7 +28,6 @@
 CONFIGURE_ARGS=	--prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}"
 USE_GMAKE=	yes
 MAKE_ARGS=	VERBOSE=1		# We want to see what's going on
-INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
 
 DISTVERSIONSUFFIX=	-source
@@ -52,12 +51,15 @@
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 USE_SDL=	sdl
 .endif
+.if !defined(WITH_DEDICATED_SERVER_ONLY)
+INSTALLS_ICONS=	yes
+.endif
 
 SUB_FILES=	pkg-message
 MAN6=		${PORTNAME}.6
 
 DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \
-		"Game;Simulation;StrategyGame;" false
+		"Game;Simulation;StrategyGame;" "${FALSE}"
 
 PORTDOCS=	32bpp.txt HOWTO_compile_lang_files.txt admin_network.txt \
 		elrail.svg elrail_tile.png elrail_track.png landscape.html \
@@ -103,11 +105,13 @@
 	${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${DATADIR}/scripts
 	${INSTALL_MAN} ${WRKSRC}/docs/${MAN6} ${MANPREFIX}/man/man6
 	${INSTALL_DATA} ${WRKSRC}/media/openttd.32.xpm ${PREFIX}/share/pixmaps
+.if !defined(WITH_DEDICATED_SERVER_ONLY)
 .for n in 16 32 48 64 128 256
 	@${MKDIR} ${PREFIX}/share/icons/hicolor/${n}x${n}/apps
 	${INSTALL_DATA} ${WRKSRC}/media/openttd.${n}.png \
 		${PREFIX}/share/icons/hicolor/${n}x${n}/apps/openttd.png
 .endfor
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/docs/,} ${DOCSDIR}


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



More information about the freebsd-ports-bugs mailing list