Attachment 131507 Details for Bug 175587 – file.diff

[patch] file.diff

file.diff (text/plain), 5.18 KB, created by tkato432 on 2013-01-25 21:10:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-01-25 21:10:06 UTC

Size: 5.18 KB

patch

obsolete

>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 <bsd.port.pre.mk>
> 
> 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 <X11/Xaw/MenuButton.h>
>-  #include <X11/Shell.h>
>-  #include <X11/Xaw/Cardinals.h>
>-! /* #include <stdlib.h>  */
>-! #include <malloc.h>
>-  #include <ctype.h>
>-  #include <unistd.h>
>-  #include "xpm.h"
>---- 11,18 ----
>-  #include <X11/Xaw/MenuButton.h>
>-  #include <X11/Shell.h>
>-  #include <X11/Xaw/Cardinals.h>
>-! #include <stdlib.h>
>-! /* #include <malloc.h>  */
>-  #include <ctype.h>
>-  #include <unistd.h>
>-  #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 <X11/Shell.h>
>- #include <X11/Xaw/Cardinals.h>
>- #include <stdlib.h>
>-+#include <string.h>
>-+#include <stdio.h>
>- /* #include <malloc.h>  */
>- #include <ctype.h>
>- #include <unistd.h>
>-@@ -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 <stdio.h>
>++#include <string.h>
>+ #include <sys/param.h>
>+ #include <sys/stat.h>
>+ #include <X11/Xos.h>
>+@@ -11,8 +12,8 @@
>+ #include <X11/Xaw/MenuButton.h>
>+ #include <X11/Shell.h>
>+ #include <X11/Xaw/Cardinals.h>
>+-/* #include <stdlib.h>  */
>+-#include <malloc.h>
>++#include <stdlib.h>
>++/* #include <malloc.h> */
>+ #include <ctype.h>
>+ #include <unistd.h>
>+ #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).

Actions: View | Diff

Attachments on bug 175587: 131507