From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Aug 23 23:20:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3B71D184 for ; Fri, 23 Aug 2013 23:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 182832B69 for ; Fri, 23 Aug 2013 23:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r7NNK0OJ088200 for ; Fri, 23 Aug 2013 23:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r7NNK0gE088199; Fri, 23 Aug 2013 23:20:00 GMT (envelope-from gnats) Resent-Date: Fri, 23 Aug 2013 23:20:00 GMT Resent-Message-Id: <201308232320.r7NNK0gE088199@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Guido Falsi Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F13D8E7F for ; Fri, 23 Aug 2013 23:11:30 +0000 (UTC) (envelope-from mad@micro.madpilot.net) Received: from micro.madpilot.net (micro.madpilot.net [88.149.173.206]) by mx1.freebsd.org (Postfix) with ESMTP id 6FD7C2B24 for ; Fri, 23 Aug 2013 23:11:30 +0000 (UTC) Received: from micro.madpilot.net (localhost [127.0.0.1]) by micro.madpilot.net (Postfix) with ESMTP id 3cMJJW3jFtz2nF; Sat, 24 Aug 2013 01:11:23 +0200 (CEST) Received: from micro.madpilot.net ([127.0.0.1]) by micro.madpilot.net (micro.madpilot.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id pzoUwCtPaRfK; Sat, 24 Aug 2013 01:11:20 +0200 (CEST) Received: by micro.madpilot.net (Postfix, from userid 1000) id 3cMJJS1PLXz2nD; Sat, 24 Aug 2013 01:11:20 +0200 (CEST) Message-Id: <3cMJJS1PLXz2nD@micro.madpilot.net> Date: Sat, 24 Aug 2013 01:11:20 +0200 (CEST) From: Guido Falsi To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/181493: [PATCH] www/nostromo: Fix build with clang plust other fixes Cc: ast@marabu.ch X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Guido Falsi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Aug 2013 23:20:01 -0000 >Number: 181493 >Category: ports >Synopsis: [PATCH] www/nostromo: Fix build with clang plust other fixes >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: Fri Aug 23 23:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Guido Falsi >Release: FreeBSD 9.1-STABLE amd64 >Organization: none >Environment: System: FreeBSD micro.madpilot.net 9.1-STABLE FreeBSD 9.1-STABLE #21 r252026: Thu Jun 20 16:27:06 CEST 2013 root@micro.madpilot.net:/usr/obj/usr/src/sys/MICRO amd64 >Description: - Fix build with clang - Handle configuration file correctly - Make installation directory relative to PREFIX, so it can be adjusted dynamically in the plist - Trim Makefile headers >How-To-Repeat: >Fix: Index: Makefile =================================================================== --- Makefile (revision 325273) +++ Makefile (working copy) @@ -1,12 +1,9 @@ -# New ports collection makefile for: nostromo -# Date created: 20 Mar 2011 -# Whom: Adrian Steinmann -# +# Created by: Adrian Steinmann # $FreeBSD$ -# PORTNAME= nostromo PORTVERSION= 1.9.5 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= http://www.nazgul.ch/dev/ @@ -15,7 +12,7 @@ LICENSE= BSD -NOSTROMO_DIR?= ${PREFIX}/nostromo +NOSTROMO_DIR?= nostromo NOSTROMO_LOGDIR?= ${NOSTROMO_DIR}/logs NOSTROMO_LOGDIR_PERMS?= 0775 @@ -24,6 +21,7 @@ MAN8= nhttpd.8 MAKE_ENV?= MAKEOBJDIR=. PREFIX=${PREFIX} NOSTROMO_DIR=${NOSTROMO_DIR} +PLIST_SUB+= NOSTROMODIR="${NOSTROMO_DIR}" NOSTROMOLOGDIR="${NOSTROMO_LOGDIR}" post-extract: @${REINPLACE_CMD} -e "s@/var/nostromo@${NOSTROMO_DIR}@g" \ @@ -37,19 +35,22 @@ @${INSTALL_SCRIPT} ${WRKSRC}/src/nhttpd/nhttpd ${PREFIX}/sbin @${INSTALL_SCRIPT} ${WRKSRC}/src/tools/crypt ${PREFIX}/sbin @${INSTALL_MAN} ${WRKSRC}/src/nhttpd/nhttpd.8 ${PREFIX}/man/man8 - @${MKDIR} ${NOSTROMO_DIR} - @${MKDIR} ${NOSTROMO_DIR}/conf - @${MKDIR} -m ${NOSTROMO_LOGDIR_PERMS} -p ${NOSTROMO_LOGDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/mimes ${NOSTROMO_DIR}/conf - @${INSTALL_DATA} ${WRKSRC}/conf/nhttpd.conf-dist ${NOSTROMO_DIR}/conf - @${MKDIR} ${NOSTROMO_DIR}/htdocs - @${INSTALL_DATA} ${WRKSRC}/htdocs/index.html ${NOSTROMO_DIR}/htdocs - @${INSTALL_DATA} ${WRKSRC}/htdocs/nostromo.gif ${NOSTROMO_DIR}/htdocs - @${MKDIR} ${NOSTROMO_DIR}/htdocs/cgi-bin + @${MKDIR} ${PREFIX}/${NOSTROMO_DIR} + @${MKDIR} ${PREFIX}/${NOSTROMO_DIR}/conf + @${MKDIR} -m ${NOSTROMO_LOGDIR_PERMS} -p ${PREFIX}/${NOSTROMO_LOGDIR} + @${INSTALL_DATA} ${WRKSRC}/conf/mimes ${PREFIX}/${NOSTROMO_DIR}/conf + @${INSTALL_DATA} ${WRKSRC}/conf/nhttpd.conf-dist ${PREFIX}/${NOSTROMO_DIR}/conf + if [ ! -f ${PREFIX}/${NOSTROMO_DIR}/conf/nhttpd.conf ]; then \ + ${CP} -p ${PREFIX}/${NOSTROMO_DIR}/conf/nhttpd.conf-dist ${PREFIX}/${NOSTROMO_DIR}/conf/nhttpd.conf ; \ + fi + @${MKDIR} ${PREFIX}/${NOSTROMO_DIR}/htdocs + @${INSTALL_DATA} ${WRKSRC}/htdocs/index.html ${PREFIX}/${NOSTROMO_DIR}/htdocs + @${INSTALL_DATA} ${WRKSRC}/htdocs/nostromo.gif ${PREFIX}/${NOSTROMO_DIR}/htdocs + @${MKDIR} ${PREFIX}/${NOSTROMO_DIR}/htdocs/cgi-bin @${INSTALL_SCRIPT} ${WRKSRC}/htdocs/cgi-bin/printenv \ - ${NOSTROMO_DIR}/htdocs/cgi-bin - @${MKDIR} ${NOSTROMO_DIR}/icons - @${INSTALL_DATA} ${WRKSRC}/icons/dir.gif ${NOSTROMO_DIR}/icons - @${INSTALL_DATA} ${WRKSRC}/icons/file.gif ${NOSTROMO_DIR}/icons + ${PREFIX}/${NOSTROMO_DIR}/htdocs/cgi-bin + @${MKDIR} ${PREFIX}/${NOSTROMO_DIR}/icons + @${INSTALL_DATA} ${WRKSRC}/icons/dir.gif ${PREFIX}/${NOSTROMO_DIR}/icons + @${INSTALL_DATA} ${WRKSRC}/icons/file.gif ${PREFIX}/${NOSTROMO_DIR}/icons .include Index: files/patch-src-libmy-strb64d.c =================================================================== --- files/patch-src-libmy-strb64d.c (revision 0) +++ files/patch-src-libmy-strb64d.c (working copy) @@ -0,0 +1,11 @@ +--- src/libmy/strb64d.c.orig 2005-06-04 10:30:04.000000000 +0200 ++++ src/libmy/strb64d.c 2013-08-23 19:17:25.700331962 +0200 +@@ -54,7 +54,7 @@ + dst[0] = '\0'; + + while (1) { +- for (i = 0, j = j; i < 4; i++, j++) { ++ for (i = 0; i < 4; i++, j++) { + if (src[j] == '\0') + goto quit; + ch = src[j]; Property changes on: files/patch-src-libmy-strb64d.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 325273) +++ pkg-plist (working copy) @@ -1,15 +1,17 @@ sbin/crypt sbin/nhttpd -nostromo/conf/mimes -nostromo/conf/nhttpd.conf-dist -nostromo/htdocs/index.html -nostromo/htdocs/nostromo.gif -nostromo/htdocs/cgi-bin/printenv -nostromo/icons/dir.gif -nostromo/icons/file.gif -@dirrmtry nostromo/conf -@dirrmtry nostromo/htdocs/cgi-bin -@dirrmtry nostromo/htdocs -@dirrmtry nostromo/icons -@dirrmtry nostromo/logs -@dirrmtry nostromo +%%NOSTROMODIR%%/conf/mimes +@unexec if cmp -s %D/%%NOSTROMODIR%%/conf/nhttpd.conf-dist %D/%%NOSTROMODIR%%/conf/nhttpd.conf; then rm -f %D/%%NOSTROMODIR%%/conf/nhttpd.conf; fi +%%NOSTROMODIR%%/conf/nhttpd.conf-dist +@exec if [ ! -f %D/%%NOSTROMODIR%%/conf/nhttpd.conf ] ; then cp -p %D/%F %B/nhttpd.conf; fi +%%NOSTROMODIR%%/htdocs/index.html +%%NOSTROMODIR%%/htdocs/nostromo.gif +%%NOSTROMODIR%%/htdocs/cgi-bin/printenv +%%NOSTROMODIR%%/icons/dir.gif +%%NOSTROMODIR%%/icons/file.gif +@dirrmtry %%NOSTROMODIR%%/conf +@dirrmtry %%NOSTROMODIR%%/htdocs/cgi-bin +@dirrmtry %%NOSTROMODIR%%/htdocs +@dirrmtry %%NOSTROMODIR%%/icons +@dirrmtry %%NOSTROMODIR%%/logs +@dirrmtry %%NOSTROMODIR%% >Release-Note: >Audit-Trail: >Unformatted: