Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 28 Aug 2013 14:37:00 GMT
From:      Boris Samorodov <bsam@FreeBSD.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/181619: [patch] x11-wm/fluxconf: fix build with clang, add LICENSE and some more
Message-ID:  <201308281437.r7SEb0th020396@oldred.freebsd.org>
Resent-Message-ID: <201308281440.r7SEe2CE019081@freefall.freebsd.org>

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

>Number:         181619
>Category:       ports
>Synopsis:       [patch] x11-wm/fluxconf: fix build with clang, add LICENSE and some more
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 28 14:40:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Boris Samorodov
>Release:        FreeBSD 10.0-CURRENT
>Organization:
BSDprint
>Environment:
FreeBSD bsam.int.wart.ru 10.0-CURRENT FreeBSD 10.0-CURRENT #36 r254961: Wed Aug 28 02:04:00 SAMT 2013     bsam@bsam.int.wart.ru:/usr/obj/usr/src/sys/BB64X  amd64
>Description:
The port does not build with clang:
-----
fluxconf.c:244:13: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]
            _("Now you must restart fluxbox (using the root menu, not killing X). Don't forget to press \"Let fluxbox change the conf\" before exiting."));
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/defines.h:4:19: note: expanded from macro '_'
#define _(String) g_locale_to_utf8(gettext (String),strlen(gettext(String)),0,0,0)
                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
-----
>How-To-Repeat:

>Fix:
. fix build with clang (CFLAGS+=-Wno-error);
. add LICENSE (GPLv2), bump PORTREVISION;
. trim headers;
. reword COMMENT;
. NOPORTDOCS -> PORT_OPTIONS:MDOCS;
. use one line install instead of an if loop.

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 325431)
+++ Makefile	(working copy)
@@ -1,21 +1,20 @@
-# Ports collection Makefile for:	fluxconf
-# Date created:				29/04/2002
-# Whom:					hendrik@scholz.net
-#
+# Created by: hendrik@scholz.net
 # $FreeBSD$
-#
 
 PORTNAME=	fluxconf
 PORTVERSION=	0.9.9
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://devaux.fabien.free.fr/flux/
 
 MAINTAINER=	alfredoj69@gmail.com
-COMMENT=	A configuration program for the fluxbox window manager
+COMMENT=	Fluxbox window manager configuration program
 
+LICENSE=	GPLv2
+
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
+CFLAGS+=	-Wno-error
 
 PORTDOCS=	fluxconf.png fluxkeys.png fluxmenu.png index.html
 PLIST_FILES=	bin/fluxbare bin/fluxconf bin/fluxkeys bin/fluxmenu \
@@ -22,12 +21,14 @@
 		share/locale/fi/LC_MESSAGES/fluxconf.mo \
 		share/locale/fr/LC_MESSAGES/fluxconf.mo
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/docs/,} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>


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



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