Attachment 28689 Details for Bug 48144 – file.diff

[patch] file.diff

file.diff (text/plain), 6.58 KB, created by tkato on 2003-02-10 15:40:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-02-10 15:40:06 UTC

Size: 6.58 KB

patch

obsolete

>diff -urN /usr/ports/cad/gtkwave/Makefile cad/gtkwave/Makefile
>--- /usr/ports/cad/gtkwave/Makefile	Mon Nov 11 18:58:56 2002
>+++ cad/gtkwave/Makefile	Mon Feb 10 21:35:18 2003
>@@ -7,7 +7,7 @@
> #
> 
> PORTNAME=	gtkwave
>-PORTVERSION=	2.0.0.p1
>+PORTVERSION=	2.0.0.p3
> PORTEPOCH=	2
> CATEGORIES=	cad
> MASTER_SITES=	ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/
>@@ -15,21 +15,25 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
> .if !exists(/usr/bin/bzip2)
>-LIB_DEPENDS=	bz2.1:${PORTSDIR}/archivers/bzip2
>+LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
> .endif
> 
> USE_GNOMENG=	yes
> USE_GNOME=	gtk12
> USE_REINPLACE=	yes
>-GNU_CONFIGURE=	yes
>+USE_LIBTOOL=	yes
>+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>+INSTALLS_SHLIB=	yes
>+LDCONFIG_DIRS=	${PREFIX}/lib/gtkwave
> 
> post-patch:
> 	@${GREP} -lR "heapsort" ${WRKSRC}/src | ${XARGS} \
> 		${REINPLACE_CMD} -e "s/heapsort/hsort/g"
> 
>-.if !defined(NOPORTDOCS)
> post-install:
>+.if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
> 	(cd ${WRKSRC}/doc ; ${INSTALL_DATA} *.png *.ps *.html ${DOCSDIR})
> 	@${MKDIR} ${EXAMPLESDIR}
>diff -urN /usr/ports/cad/gtkwave/distinfo cad/gtkwave/distinfo
>--- /usr/ports/cad/gtkwave/distinfo	Mon May 13 00:14:07 2002
>+++ cad/gtkwave/distinfo	Mon Feb 10 21:16:50 2003
>@@ -1 +1 @@
>-MD5 (gtkwave-2.0.0pre1.tar.gz) = c09ee3afe8a1ab5ff7359407dc5d5caf
>+MD5 (gtkwave-2.0.0pre3.tar.gz) = 09df5138841a962cd0b4e8c3a57967f3
>diff -urN /usr/ports/cad/gtkwave/files/patch-alloc.h cad/gtkwave/files/patch-alloc.h
>--- /usr/ports/cad/gtkwave/files/patch-alloc.h	Mon May 13 00:14:08 2002
>+++ cad/gtkwave/files/patch-alloc.h	Thu Jan  1 09:00:00 1970
>@@ -1,25 +0,0 @@
>---- src/alloc.h.orig	Sun May 12 22:53:00 2002
>-+++ src/alloc.h	Sun May 12 22:53:27 2002
>-@@ -39,22 +39,6 @@
>- #define alloca _alloca
>- #endif
>- 
>--#ifndef __GNUC__
>--# if HAVE_ALLOCA_H
>--#  include <alloca.h>
>--# else
>--#  ifdef _AIX
>--# pragma alloca
>--#  else
>--#   ifndef alloca               /* predefined by HP cc +Olibcalls */
>--char *alloca ();
>--#   endif
>--#  endif
>--# endif
>--#else
>--# include <alloca.h>
>--#endif
>--
>- #define wave_alloca alloca
>- 
>- #endif
>diff -urN /usr/ports/cad/gtkwave/files/patch-configure cad/gtkwave/files/patch-configure
>--- /usr/ports/cad/gtkwave/files/patch-configure	Thu Jan  1 09:00:00 1970
>+++ cad/gtkwave/files/patch-configure	Mon Feb 10 21:26:23 2003
>@@ -0,0 +1,10 @@
>+--- configure.orig	Wed Feb  5 20:37:21 2003
>++++ configure	Mon Feb 10 21:26:17 2003
>+@@ -7492,6 +7492,7 @@
>+ 
>+ # This can be used to rebuild libtool when needed
>+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
>+ 
>+ # Always use our own libtool.
>+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
>diff -urN /usr/ports/cad/gtkwave/files/patch-main.c cad/gtkwave/files/patch-main.c
>--- /usr/ports/cad/gtkwave/files/patch-main.c	Mon May 13 00:14:08 2002
>+++ cad/gtkwave/files/patch-main.c	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- src/main.c.orig	Sun May 12 22:59:38 2002
>-+++ src/main.c	Sun May 12 22:59:51 2002
>-@@ -62,7 +62,7 @@
>- long lastpos;
>- long endpos;
>- long fsize;
>--long val_size;
>-+off_t val_size;
>- int no_of_reads;
>- struct stat finfo;
>- int is_initial_read = 0;
>diff -urN /usr/ports/cad/gtkwave/files/patch-print.c cad/gtkwave/files/patch-print.c
>--- /usr/ports/cad/gtkwave/files/patch-print.c	Mon May 13 00:14:08 2002
>+++ cad/gtkwave/files/patch-print.c	Thu Jan  1 09:00:00 1970
>@@ -1,10 +0,0 @@
>---- src/print.c.orig	Sun May 12 23:01:00 2002
>-+++ src/print.c	Sun May 12 23:01:42 2002
>-@@ -36,7 +36,6 @@
>- #include "analyzer.h"
>- #include "utils.h"
>- #include "bsearch.h"
>--#include "alloca.h"
>- #include "debug.h"
>- #include "strace.h"
>- #include "print.h"
>diff -urN /usr/ports/cad/gtkwave/files/patch-v2l_debug.h cad/gtkwave/files/patch-v2l_debug.h
>--- /usr/ports/cad/gtkwave/files/patch-v2l_debug.h	Mon May 13 00:14:08 2002
>+++ cad/gtkwave/files/patch-v2l_debug.h	Thu Jan  1 09:00:00 1970
>@@ -1,17 +0,0 @@
>---- src/helpers/v2l_debug.h.orig	Sat May 11 00:28:43 2002
>-+++ src/helpers/v2l_debug.h	Sat May 11 00:30:02 2002
>-@@ -79,14 +79,6 @@
>-  * memory leaks because of it.  you have been warned.
>-  */
>- 
>--#ifndef __sun__
>--#ifndef alloca
>--#define alloca __alloca
>--#endif
>--#else
>--#include <alloca.h>
>--#endif
>--
>- #define wave_alloca alloca
>- 
>- 
>diff -urN /usr/ports/cad/gtkwave/pkg-plist cad/gtkwave/pkg-plist
>--- /usr/ports/cad/gtkwave/pkg-plist	Tue Sep 10 20:06:13 2002
>+++ cad/gtkwave/pkg-plist	Mon Feb 10 21:28:45 2003
>@@ -1,20 +1,14 @@
> bin/gtkwave
>-bin/mvl2lxt
>-bin/mvl2vcd
>-bin/tex2vcd
> bin/vcd2lxt
>-share/gtkwave/pixmaps/add_signals.xpm
>-share/gtkwave/pixmaps/larrow.xpm
>-share/gtkwave/pixmaps/rarrow.xpm
>-share/gtkwave/pixmaps/zoom_begin.xpm
>-share/gtkwave/pixmaps/zoom_end.xpm
>-share/gtkwave/pixmaps/zoom_fit.xpm
>-share/gtkwave/pixmaps/zoom_in.xpm
>-share/gtkwave/pixmaps/zoom_out.xpm
>-share/gtkwave/pixmaps/zoom_redo.xpm
>-share/gtkwave/pixmaps/zoom_undo.xpm
>-@dirrm share/gtkwave/pixmaps
>-@dirrm share/gtkwave
>+lib/gtkwave/reader_lxt.a
>+lib/gtkwave/reader_lxt.so
>+lib/gtkwave/reader_lxt.so.0
>+lib/gtkwave/reader_out.a
>+lib/gtkwave/reader_out.so
>+lib/gtkwave/reader_out.so.0
>+lib/gtkwave/reader_vcd.a
>+lib/gtkwave/reader_vcd.so
>+lib/gtkwave/reader_vcd.so.0
> %%PORTDOCS%%share/doc/gtkwave/data_format.png
> %%PORTDOCS%%share/doc/gtkwave/edit_menu.png
> %%PORTDOCS%%share/doc/gtkwave/file_menu.png
>@@ -40,9 +34,33 @@
> %%PORTDOCS%%share/doc/gtkwave/w9.png
> %%PORTDOCS%%share/doc/gtkwave/wps.png
> %%PORTDOCS%%share/doc/gtkwave/zoom_submenu.png
>-%%PORTDOCS%%@dirrm share/doc/gtkwave
>-%%PORTDOCS%%share/examples/gtkwave/agonynan_bccom.evcd.gz
>+%%PORTDOCS%%share/examples/gtkwave/agonynan_bccom.vcd.gz
> %%PORTDOCS%%share/examples/gtkwave/pci.vcd.gz
> %%PORTDOCS%%share/examples/gtkwave/simple.vcd
> %%PORTDOCS%%share/examples/gtkwave/sram.vcd.gz
>+share/gtkwave/pixmaps/add_signals.xpm
>+share/gtkwave/pixmaps/insert_trace.xpm
>+share/gtkwave/pixmaps/menu_16.xpm
>+share/gtkwave/pixmaps/next_page.xpm
>+share/gtkwave/pixmaps/prev_page.xpm
>+share/gtkwave/pixmaps/stock_cut.xpm
>+share/gtkwave/pixmaps/stock_first.xpm
>+share/gtkwave/pixmaps/stock_last.xpm
>+share/gtkwave/pixmaps/stock_left.xpm
>+share/gtkwave/pixmaps/stock_open_16.xpm
>+share/gtkwave/pixmaps/stock_paste.xpm
>+share/gtkwave/pixmaps/stock_redo.xpm
>+share/gtkwave/pixmaps/stock_redo_16.xpm
>+share/gtkwave/pixmaps/stock_right.xpm
>+share/gtkwave/pixmaps/stock_undo.xpm
>+share/gtkwave/pixmaps/stock_zoom_1.xpm
>+share/gtkwave/pixmaps/stock_zoom_fit.xpm
>+share/gtkwave/pixmaps/stock_zoom_in.xpm
>+share/gtkwave/pixmaps/stock_zoom_out.xpm
>+share/gtkwave/pixmaps/time_16.xpm
>+share/gtkwave/pixmaps/vcd_mime.xpm
>+@dirrm share/gtkwave/pixmaps
>+@dirrm share/gtkwave
> %%PORTDOCS%%@dirrm share/examples/gtkwave
>+%%PORTDOCS%%@dirrm share/doc/gtkwave
>+@dirrm lib/gtkwave

Actions: View | Diff

Attachments on bug 48144: 28689