From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Sep 4 17:10:00 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 8F83325E for ; Wed, 4 Sep 2013 17:10:00 +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 6D3C92438 for ; Wed, 4 Sep 2013 17:10:00 +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 r84HA05s014502 for ; Wed, 4 Sep 2013 17:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r84HA0f3014500; Wed, 4 Sep 2013 17:10:00 GMT (envelope-from gnats) Resent-Date: Wed, 4 Sep 2013 17:10:00 GMT Resent-Message-Id: <201309041710.r84HA0f3014500@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, Tijl Coosemans 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 AC284F77 for ; Wed, 4 Sep 2013 17:05:06 +0000 (UTC) (envelope-from tijl@coosemans.org) Received: from mailrelay001.isp.belgacom.be (mailrelay001.isp.belgacom.be [195.238.6.51]) by mx1.freebsd.org (Postfix) with ESMTP id 2E0DB23E6 for ; Wed, 4 Sep 2013 17:05:05 +0000 (UTC) Received: from 176.65-177-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.177.65.176]) by relay.skynet.be with ESMTP; 04 Sep 2013 19:04:58 +0200 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.7/8.14.7) with ESMTP id r84H4vQq075817 for ; Wed, 4 Sep 2013 19:04:57 +0200 (CEST) (envelope-from tijl@kalimero.tijl.coosemans.org) Received: (from tijl@localhost) by kalimero.tijl.coosemans.org (8.14.7/8.14.7/Submit) id r84H4vVH075816; Wed, 4 Sep 2013 19:04:57 +0200 (CEST) (envelope-from tijl) Message-Id: <201309041704.r84H4vVH075816@kalimero.tijl.coosemans.org> Date: Wed, 4 Sep 2013 19:04:57 +0200 (CEST) From: Tijl Coosemans To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/181820: [patch] deskutils/xmdiary: remove USE_GCC=any X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Tijl Coosemans List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Sep 2013 17:10:00 -0000 >Number: 181820 >Category: ports >Synopsis: [patch] deskutils/xmdiary: remove USE_GCC=any >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: Wed Sep 04 17:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Tijl Coosemans >Release: FreeBSD 10.0-CURRENT i386 >Organization: >Environment: >Description: The attached patch removes USE_GCC=any and fixes the build with clang (change "unsigned int argc" into "int argc"). It also removes the scripts directory. The scripts do not work with the new patch in current. The nomalloc script is replaced with a REINPLACE_CMD and the noextradepend script no longer seems to be necessary. >How-To-Repeat: >Fix: --- xmdiary.patch begins here --- Index: deskutils/xmdiary/Makefile =================================================================== --- deskutils/xmdiary/Makefile (revision 326283) +++ deskutils/xmdiary/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= xmdiary PORTVERSION= 3.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= office @@ -15,17 +15,15 @@ COMMENT= Personal and group calendar uti NO_CDROM= Don't sell for profit EXTRACT_ONLY= ${DISTNAME}.tar.gz USES= imake motif -USE_GCC= any USE_XORG= x11 xext xp xpm xt MAN1= xdaclunix.1 xdalarm.1 xdcustom.1 xddump.1 xdiary.1 xdinitdb.1 \ xdlight.1 xdnotify.1 xdprformat.1 xdremind.1 xdremove.1 \ xdrestore.1 post-patch: - @${ECHO_MSG} removing the "malloc.h" includes - ${SH} ${SCRIPTDIR}/nomalloc $(WRKSRC) 2>&1 > /dev/zero - @${ECHO_MSG} removing unnecessary DependTarget from Imakefile-s - ${SH} ${SCRIPTDIR}/noextradepend $(WRKSRC) 2>&1 > /dev/zero + @${REINPLACE_CMD} -e 's/malloc\.h/stdlib.h/' \ + ${WRKSRC}/tools/LstLinked.c ${WRKSRC}/tools/System.c \ + ${WRKSRC}/xtools/xitClipboard.c ${WRKSRC}/xtools/xitInfoFile.c ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|CcCmd gcc|CcCmd ${CC}|' '${WRKSRC}/XDiary.tmpl' Index: deskutils/xmdiary/files/patch-warnings =================================================================== --- deskutils/xmdiary/files/patch-warnings (revision 326283) +++ deskutils/xmdiary/files/patch-warnings (working copy) @@ -524,8 +524,9 @@ ----------------------------------------------------------------------------*/ -void +- main( unsigned int argc, char *argv[] ) +int - main( unsigned int argc, char *argv[] ) ++ main( int argc, char *argv[] ) { --- xdalarm/xtmAlarmProc.c 1997-05-04 18:02:19.000000000 -0400 +++ xdalarm/xtmAlarmProc.c 2013-03-27 21:54:22.000000000 -0400 @@ -533,8 +534,9 @@ ----------------------------------------------------------------------------*/ -void +- main( unsigned int argc, char *argv[] ) +int - main( unsigned int argc, char *argv[] ) ++ main( int argc, char *argv[] ) { --- xdcustom/xtmCustom.c 1997-05-04 18:02:16.000000000 -0400 +++ xdcustom/xtmCustom.c 2013-03-27 21:55:45.000000000 -0400 @@ -542,8 +544,9 @@ ----------------------------------------------------------------------------*/ -void +- main( unsigned int argc, char *argv[] ) +int - main( unsigned int argc, char *argv[] ) ++ main( int argc, char *argv[] ) { @@ -616,5 +616,5 @@ @@ -586,8 +589,9 @@ ----------------------------------------------------------------------------*/ -void +- main( unsigned int argc, char **argv ) +int - main( unsigned int argc, char **argv ) ++ main( int argc, char **argv ) { --- xdnotify/xtmNotify.c 1997-05-04 18:02:15.000000000 -0400 +++ xdnotify/xtmNotify.c 2013-03-27 21:57:28.000000000 -0400 @@ -595,8 +599,9 @@ ----------------------------------------------------------------------------*/ -void +- main( unsigned int argc, char *argv[] ) +int - main( unsigned int argc, char *argv[] ) ++ main( int argc, char *argv[] ) { --- xdprformat/xtmPrFormat.c 1997-05-04 18:02:15.000000000 -0400 +++ xdprformat/xtmPrFormat.c 2013-03-27 21:58:19.000000000 -0400 @@ -612,8 +617,9 @@ ----------------------------------------------------------------------------*/ -void +- main( unsigned int argc, char *argv[] ) +int - main( unsigned int argc, char *argv[] ) ++ main( int argc, char *argv[] ) { --- xdrestore/xtmRestore.c 1997-05-04 18:02:14.000000000 -0400 +++ xdrestore/xtmRestore.c 2013-03-27 21:59:54.000000000 -0400 Index: deskutils/xmdiary/scripts/noextradepend =================================================================== --- deskutils/xmdiary/scripts/noextradepend (revision 326283) +++ deskutils/xmdiary/scripts/noextradepend (working copy) @@ -1,15 +0,0 @@ -#!/bin/sh - -for f in `find $1 -type f -name Imakefile -print | xargs grep -l Library.tmpl` -do - -patch -p << END_OF_PATCH ---- $f.orig -+++ $f -@@ -30,1 +30,1 @@ --DependTarget() -+/* DependTarget() -- Library.tmpl contains this now */ - -END_OF_PATCH - -done Index: deskutils/xmdiary/scripts/nomalloc =================================================================== --- deskutils/xmdiary/scripts/nomalloc (revision 326283) +++ deskutils/xmdiary/scripts/nomalloc (working copy) @@ -1,16 +0,0 @@ -#!/bin/sh - -for f in `find $1 -type f -name \*.\[ch\] -print | xargs grep -l malloc.h` -do - -patch -p << END_OF_PATCH ---- $f.orig -+++ $f -@@ -10,1 +10,1 @@ --#include -+#include - -END_OF_PATCH - -done - --- xmdiary.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: