From 57f7dccc47c5bafb0e158356c3b569743ac9de25 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Mon, 4 Feb 2013 14:24:08 +0000 Subject: - Update MASTER_SITES - Fix build with clang - Add MAKE_JOBS_SAFE PR: 175587 Submitted by: Ports Fury --- x11/bricons/Makefile | 17 ++++++++++++----- x11/bricons/files/patch-ab | 38 -------------------------------------- x11/bricons/files/patch-ad | 22 ---------------------- x11/bricons/files/patch-gen.h | 32 ++++++++++++++++++++++++++++++++ x11/bricons/pkg-descr | 13 ++++++------- 5 files changed, 50 insertions(+), 72 deletions(-) delete mode 100644 x11/bricons/files/patch-ab delete mode 100644 x11/bricons/files/patch-ad create mode 100644 x11/bricons/files/patch-gen.h (limited to 'x11') diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile index f430fbe72262..6799c3cbbe64 100644 --- a/x11/bricons/Makefile +++ b/x11/bricons/Makefile @@ -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 --git a/x11/bricons/files/patch-ab b/x11/bricons/files/patch-ab deleted file mode 100644 index 3da195468e1f..000000000000 --- a/x11/bricons/files/patch-ab +++ /dev/null @@ -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 --git a/x11/bricons/files/patch-ad b/x11/bricons/files/patch-ad deleted file mode 100644 index 80fff2e09f81..000000000000 --- a/x11/bricons/files/patch-ad +++ /dev/null @@ -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 --git a/x11/bricons/files/patch-gen.h b/x11/bricons/files/patch-gen.h new file mode 100644 index 000000000000..8cd99bc489b7 --- /dev/null +++ b/x11/bricons/files/patch-gen.h @@ -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 --git a/x11/bricons/pkg-descr b/x11/bricons/pkg-descr index 3e17d7e1879f..6e8fe95a70cf 100644 --- a/x11/bricons/pkg-descr +++ b/x11/bricons/pkg-descr @@ -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). -- cgit v1.2.3