Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Feb 2014 06:15:25 +0400 (MSK)
From:      Dmitry Marakasov <amdmi3@amdmi3.ru>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        nemysis@FreeBSD.org
Subject:   ports/186711: [PATCH] games/maelstrom: don't silence warnings, fixes
Message-ID:  <20140213021525.63E3545648@hades.panopticon>
Resent-Message-ID: <201402130220.s1D2K0pt072408@freefall.freebsd.org>

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

>Number:         186711
>Category:       ports
>Synopsis:       [PATCH] games/maelstrom: don't silence warnings, fixes
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 13 02:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
- Don't silence warnings
- Simplify doc installation handling
- Fix permission settings

Note the last one: you probably need the same fix for other ports.

You must not set permissions in the Makefile.

First, pkg will clear owners to root:wheel on syncing, but will
leave suid/sgid bits, so you'll end up with suid-root or sgid-wheel
(this case) binary.

Second, you won't be able to `make package` as a plain user.

Owners/perms should be done with plist instead, see patch.

Port maintainer (nemysis@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- maelstrom-3.0.6_9.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 344035)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	maelstrom
 PORTVERSION=	3.0.6
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	http://slouken.libsdl.org/projects/Maelstrom/src/ \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
@@ -29,11 +29,11 @@
 
 OPTIONS_DEFINE=	DOCS
 
+DOCS_INSTALL_TARGET=install install_gamedocs
+
 DESKTOP_ENTRIES="Maelstrom" "" ${PORTNAME} \
 		"Maelstrom" "Game;ArcadeGame;" ""
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|prefix = @prefix@|prefix = $${DESTDIR}@prefix@| ; \
@@ -40,22 +40,7 @@
 		s|$$(DESTDIR)$$(bindir)|$$(bindir)|' \
 		${WRKSRC}/Makefile.in
 
-	@(cd ${WRKSRC} ; ${REINPLACE_CMD} \
-		-e 's|@CFLAGS@|@CFLAGS@ -w| ; \
-		s|$$(CXXFLAGS)|$$(CXXFLAGS) -w|' \
-		Makefile.in maclib/Makefile.in \
-		netlogic/Makefile.in screenlib/Makefile.in)
-
-.if ${PORT_OPTIONS:MDOCS}
-INSTALL_TARGET=	install install_gamedocs
-.endif
-
 post-install:
-	${CHOWN} root:games ${STAGEDIR}${PREFIX}/bin/Maelstrom
-	${CHMOD} 2755 ${STAGEDIR}${PREFIX}/bin/Maelstrom
-	${CHMOD} 664 ${STAGEDIR}${PREFIX}/share/Maelstrom/Maelstrom-Scores
-	${CHOWN} root:games \
-		${STAGEDIR}${PREFIX}/share/Maelstrom/Maelstrom-Scores
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 344035)
+++ pkg-plist	(working copy)
@@ -1,5 +1,9 @@
+@group games
+@mode 2755
 bin/Maelstrom
 bin/Maelstrom-netd
+@mode
+@group
 %%DATADIR%%/Images/Maelstrom_Icon#100.cicn
 %%DATADIR%%/Images/Maelstrom_Icon#101.cicn
 %%DATADIR%%/Images/Maelstrom_Icon#102.cicn
@@ -28,7 +32,11 @@
 %%DATADIR%%/Images/Maelstrom_Titles#999.bmp
 %%DATADIR%%/Images/Makefile
 %%DATADIR%%/Images/Makefile.in
+@group games
+@mode 644
 %%DATADIR%%/Maelstrom-Scores
+@mode
+@group
 %%DATADIR%%/Maelstrom_Fonts
 %%DATADIR%%/Maelstrom_Sounds
 %%DATADIR%%/Maelstrom_Sprites
--- maelstrom-3.0.6_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?20140213021525.63E3545648>