From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 25 21:10:06 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DC947DE0 for ; Fri, 25 Jan 2013 21:10:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id C59AD9A5 for ; Fri, 25 Jan 2013 21:10:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0PLA62P075112 for ; Fri, 25 Jan 2013 21:10:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0PLA6Vu075111; Fri, 25 Jan 2013 21:10:06 GMT (envelope-from gnats) Resent-Date: Fri, 25 Jan 2013 21:10:06 GMT Resent-Message-Id: <201301252110.r0PLA6Vu075111@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, KATO Tsuguru Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C85CFC61 for ; Fri, 25 Jan 2013 21:03:09 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa105lp.auone-net.jp (msa105lp.auone-net.jp [222.3.140.168]) by mx1.freebsd.org (Postfix) with ESMTP id 72A9493E for ; Fri, 25 Jan 2013 21:03:09 +0000 (UTC) Received: from localhost.localdomain (ZT034163.ppp.dion.ne.jp [59.128.34.163]) by msa105lp.auone-net.jp (au one net msa) with ESMTP id 5162750036 for ; Sat, 26 Jan 2013 06:03:03 +0900 (JST) Message-Id: <20130126054943.4b7aad6f00e9ed04e9b1827c@yahoo.com> Date: Sat, 26 Jan 2013 05:49:43 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/175587: x11/bricons: Update MASTER_SITES X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jan 2013 21:10:06 -0000 >Number: 175587 >Category: ports >Synopsis: x11/bricons: Update MASTER_SITES >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 Jan 25 21:10:06 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p11 i386 >Organization: >Environment: >Description: - Update MASTER_SITES - Fix build with clang - Add MAKE_JOBS_SAFE New file: files/patch-gen.h Remove file: files/patch-ab files/patch-ad >How-To-Repeat: >Fix: diff -urN /usr/ports/x11/bricons/Makefile x11/bricons/Makefile --- /usr/ports/x11/bricons/Makefile 2012-11-08 10:10:00.000000000 +0900 +++ x11/bricons/Makefile 2013-01-12 22:23:48.000000000 +0900 @@ -7,24 +7,31 @@ PORTNAME= bricons PORTVERSION= 3.0 +DISTVERSIONPREFIX= athena- PORTREVISION= 2 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.x.org/R5contrib/ -DISTNAME= ${PORTNAME} -EXTRACT_SUFX= -athena-3.0.tar.Z +MASTER_SITES= XCONTRIB/../R5contrib +EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Quick start up utility for applications on an X display -USE_IMAKE= yes +WRKSRC= ${WRKDIR}/${PORTNAME} + USE_PERL5_BUILD=yes USE_XORG= xaw +USE_IMAKE= yes +MAKE_JOBS_SAFE= yes + MAN1= bricons.1 .include post-patch: - @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/Xbricons + @${REINPLACE_CMD} -e \ + 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/Xbricons + @${REINPLACE_CMD} -e \ + 's|^unsigned int argc|int argc|' ${WRKSRC}/main.c post-install: ${INSTALL_DATA} ${WRKSRC}/Xbricons ${PREFIX}/lib/X11/app-defaults diff -urN /usr/ports/x11/bricons/files/patch-ab x11/bricons/files/patch-ab --- /usr/ports/x11/bricons/files/patch-ab 2012-11-08 10:10:00.000000000 +0900 +++ x11/bricons/files/patch-ab 1970-01-01 09:00:00.000000000 +0900 @@ -1,38 +0,0 @@ -*** gen.h.orig Thu Jan 21 21:27:33 1993 ---- gen.h Sat Aug 3 15:14:37 1996 -*************** -*** 11,18 **** - #include - #include - #include -! /* #include */ -! #include - #include - #include - #include "xpm.h" ---- 11,18 ---- - #include - #include - #include -! #include -! /* #include */ - #include - #include - #include "xpm.h" -*************** -*** 32,38 **** - #define NO_OF_COLS 18 /* default number of columns */ - - #define EDITOR "xterm -e " /* editor used to edit icon file. */ -! #define FORMATTER "xterm -e vi " /* text formatter for help file */ - #define HELP_VIEWER " " /* viewer for help file */ - - #define MAXPROCS 20 ---- 32,38 ---- - #define NO_OF_COLS 18 /* default number of columns */ - - #define EDITOR "xterm -e " /* editor used to edit icon file. */ -! #define FORMATTER "xterm -e man " /* text formatter for help file */ - #define HELP_VIEWER " " /* viewer for help file */ - - #define MAXPROCS 20 diff -urN /usr/ports/x11/bricons/files/patch-ad x11/bricons/files/patch-ad --- /usr/ports/x11/bricons/files/patch-ad 2012-11-08 10:10:00.000000000 +0900 +++ x11/bricons/files/patch-ad 1970-01-01 09:00:00.000000000 +0900 @@ -1,22 +0,0 @@ ---- gen.h.orig Fri Aug 23 17:09:23 2002 -+++ gen.h Fri Aug 23 17:10:23 2002 -@@ -12,6 +12,8 @@ - #include - #include - #include -+#include -+#include - /* #include */ - #include - #include -@@ -75,10 +77,6 @@ - }ChildInfo; - - ChildInfo ci_ptr[MAXPROCS]; -- --/* forward declarations */ --int fprintf(), ungetc(), fclose(), fscanf(); --char *strcpy(), *getenv(), *malloc(); - - typedef int bool_t; - diff -urN /usr/ports/x11/bricons/files/patch-gen.h x11/bricons/files/patch-gen.h --- /usr/ports/x11/bricons/files/patch-gen.h 1970-01-01 09:00:00.000000000 +0900 +++ x11/bricons/files/patch-gen.h 2013-01-12 22:15:02.000000000 +0900 @@ -0,0 +1,32 @@ +--- gen.h.orig 1993-01-22 05:27:33.000000000 +0900 ++++ gen.h 2013-01-12 22:14:38.000000000 +0900 +@@ -1,6 +1,7 @@ + static char* sccs_gen_h = "%W%%G%"; + + #include ++#include + #include + #include + #include +@@ -11,8 +12,8 @@ + #include + #include + #include +-/* #include */ +-#include ++#include ++/* #include */ + #include + #include + #include "xpm.h" +@@ -76,10 +77,6 @@ + + ChildInfo ci_ptr[MAXPROCS]; + +-/* forward declarations */ +-int fprintf(), ungetc(), fclose(), fscanf(); +-char *strcpy(), *getenv(), *malloc(); +- + typedef int bool_t; + + Pixmap pix, pix2; diff -urN /usr/ports/x11/bricons/pkg-descr x11/bricons/pkg-descr --- /usr/ports/x11/bricons/pkg-descr 2012-11-08 10:10:00.000000000 +0900 +++ x11/bricons/pkg-descr 2013-01-12 23:00:37.000000000 +0900 @@ -1,7 +1,6 @@ - Bricons program allows the user to quickly start up appli- - cations by selecting the appropriate button from the dis- - play and pressing the left mouse button. A maximum of up - to sixteen main menu buttons can be displayed. Each main - menu button can launch an application or pop-up a sub menu - containing more buttons. The buttons can be represented as - a bitmap, text or a colour icon (i.e Pixmap). +Bricons program allows the user to quickly start up applications by +selecting the appropriate button from the display and pressing the left +mouse button. A maximum of up to sixteen main menu buttons can be +displayed. Each main menu button can launch an application or pop-up a +sub menu containing more buttons. The buttons can be represented as a +bitmap, text or a colour icon (i.e Pixmap). >Release-Note: >Audit-Trail: >Unformatted: