From 3ae898f507e3312596fd6aaf4d423797615b28b9 Mon Sep 17 00:00:00 2001 From: Dmitry Sivachenko Date: Thu, 1 Nov 2001 20:17:14 +0000 Subject: Upgrade to 1.2.0 PR: 31664 Submitted by: MAINTAINER --- devel/gvd/Makefile | 9 ++- devel/gvd/distinfo | 2 +- devel/gvd/files/freebsd.h | 169 ---------------------------------------------- devel/gvd/files/patch-aa | 27 -------- devel/gvd/files/patch-ab | 22 ++++++ devel/gvd/pkg-plist | 17 +++++ 6 files changed, 44 insertions(+), 202 deletions(-) delete mode 100644 devel/gvd/files/freebsd.h delete mode 100644 devel/gvd/files/patch-aa create mode 100644 devel/gvd/files/patch-ab (limited to 'devel/gvd') diff --git a/devel/gvd/Makefile b/devel/gvd/Makefile index 309f5e3edf3c..e45c5338258f 100644 --- a/devel/gvd/Makefile +++ b/devel/gvd/Makefile @@ -6,23 +6,22 @@ # PORTNAME= gvd -PORTVERSION= 1.0.1 +PORTVERSION= 1.2.0 CATEGORIES= devel MASTER_SITES= http://libre.act-europe.fr/gvd/ -MASTER_SITE_SUBDIR= . old +DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tgz MAINTAINER= sam@inf.enst.fr BUILD_DEPENDS= adagcc:${PORTSDIR}/lang/gnat LIB_DEPENDS= gtkada.12:${PORTSDIR}/x11-toolkits/gtkada +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src + GNU_CONFIGURE= yes CONFIGURE_ENV= CC=adagcc MAKE_ENV= CC=adagcc USE_X_PREFIX= yes USE_GMAKE= yes -post-extract: - ${CP} ${FILESDIR}/freebsd.h ${WRKSRC}/gnat/system/ - .include diff --git a/devel/gvd/distinfo b/devel/gvd/distinfo index cc2c08e9836c..923df590fc42 100644 --- a/devel/gvd/distinfo +++ b/devel/gvd/distinfo @@ -1 +1 @@ -MD5 (gvd-1.0.1.tar.gz) = a7c4c43da0c06818c1ccf1d9231c1f3a +MD5 (gvd-1.2.0-src.tgz) = b3662dfced22840bc3fbce5184a47482 diff --git a/devel/gvd/files/freebsd.h b/devel/gvd/files/freebsd.h deleted file mode 100644 index 3ca69c9d6253..000000000000 --- a/devel/gvd/files/freebsd.h +++ /dev/null @@ -1,169 +0,0 @@ -/* s/ file for freebsd system. */ - -/* Get the correct __FreeBSD_version, even if this is before that was - defined. */ -#ifndef __FreeBSD__ -#define __FreeBSD_version 199401 -#elif __FreeBSD__ == 1 -#define __FreeBSD_version 199405 -#else -#include -#endif - -/* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up. - Earlier versions do not have shared libraries, so inhibit them. - You can inhibit them on newer systems if you wish - by defining NO_SHARED_LIBS. */ -#ifndef __FreeBSD__ -#define NO_SHARED_LIBS -#endif - - -#if 0 /* This much, alone, seemed sufficient as of 19.23. - But it seems better to be independent of netbsd.h. */ -#include "netbsd.h" - -#undef LIB_GCC -#define LIB_GCC -lgcc -#undef NEED_ERRNO -#endif /* 0 */ - - -/* Get most of the stuff from bsd4.3 */ -#include "bsd4-3.h" - -/* For mem-limits.h. */ -#define BSD4_2 - -/* These aren't needed, since we have getloadavg. */ -#undef KERNEL_FILE -#undef LDAV_SYMBOL - -#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) - -/* Use XPG4 Library for FreeBSD */ -#define LIBS_XPG -#if (__FreeBSD_version >= 220000 && __FreeBSD_version < 400020) \ - || (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005) -#ifdef USE_XPG -#undef LIBS_XPG -#define LIBS_XPG -lxpg4 -#endif -#endif - -#define LIBS_DEBUG -#define LIBS_SYSTEM -lutil LIBS_XPG -#if __FreeBSD_version < 400000 -#define LIBS_TERMCAP -ltermcap -#endif - -#define SYSV_SYSTEM_DIR - -/* freebsd has POSIX-style pgrp behavior. */ -#undef BSD_PGRPS -#define GETPGRP_NO_ARG - -#ifdef __ELF__ - -#define LD_SWITCH_SYSTEM - -#ifdef __alpha__ -#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o -#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o -#else -#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o -#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o -#endif - -#define UNEXEC unexelf.o -#undef LIB_GCC -#define LIB_GCC - -#else /* not __ELF__ */ - -#ifndef NO_SHARED_LIBS -#define LD_SWITCH_SYSTEM -e start -dc -#define HAVE_TEXT_START /* No need to define `start_of_text'. */ -#if __FreeBSD_version >= 300002 -#define START_FILES pre-crt0.o /usr/lib/aout/crt0.o -#else /* __FreeBSD_version < 300002 */ -#define START_FILES pre-crt0.o /usr/lib/crt0.o -#endif /* __FreeBSD_version < 300002 */ -#define UNEXEC unexsunos4.o -#define RUN_TIME_REMAP -#define LIB_GCC -lgcc - -#ifndef N_TRELOFF -#define N_PAGSIZ(x) __LDPGSZ -#define N_BSSADDR(x) (N_ALIGN(x, N_DATADDR(x)+x.a_data)) -#define N_TRELOFF(x) N_RELOFF(x) -#endif -#else /* NO_SHARED_LIBS */ -#ifdef __FreeBSD__ /* shared libs are available, but the user prefers - not to use them. */ -#define LD_SWITCH_SYSTEM -Bstatic -#define A_TEXT_OFFSET(x) (sizeof (struct exec)) -#define A_TEXT_SEEK(hdr) (N_TXTOFF(hdr) + A_TEXT_OFFSET(hdr)) -#endif /* __FreeBSD__ */ -#endif /* NO_SHARED_LIBS */ - -#endif /* not __ELF__ */ - -#define HAVE_WAIT_HEADER -#define HAVE_GETLOADAVG -/*#define HAVE_GETPAGESIZE /* configure now puts this in config.h */ -#define HAVE_TERMIOS -#define NO_TERMIO -#define DECLARE_GETPWUID_WITH_UID_T - -/* freebsd uses OXTABS instead of the expected TAB3. */ -#define TABDLY OXTABS -#define TAB3 OXTABS - -/* this silences a few compilation warnings */ -#undef BSD_SYSTEM -#if __FreeBSD__ == 1 -#define BSD_SYSTEM 199103 -#elif __FreeBSD__ == 2 -#define BSD_SYSTEM 199306 -#elif __FreeBSD__ >= 3 -#define BSD_SYSTEM 199506 -#endif - -#define WAITTYPE int -/* get this since it won't be included if WAITTYPE is defined */ -#ifdef emacs -#include -#endif -#define WRETCODE(w) (_W_INT(w) >> 8) - -/* Needed to avoid hanging when child process writes an error message - and exits -- enami tsugutomo . */ -#define vfork fork - -/* Don't close pty in process.c to make it as controlling terminal. - It is already a controlling terminal of subprocess, because we did - ioctl TIOCSCTTY. */ -#define DONT_REOPEN_PTY - -/* CLASH_DETECTION is defined in bsd4-3.h. - In FreeBSD 2.1.5 (and other 2.1.x), this results useless symbolic links - remaining in /tmp or other directories with +t bit. - To avoid this problem, you could #undef it to use no file lock. */ -/* #undef CLASH_DETECTION */ - -/* Circumvent a bug in FreeBSD. In the following sequence of - writes/reads on a PTY, read(2) returns bogus data: - - write(2) 1022 bytes - write(2) 954 bytes, get EAGAIN - read(2) 1024 bytes in process_read_output - read(2) 11 bytes in process_read_output - - That is, read(2) returns more bytes than have ever been written - successfully. The 1033 bytes read are the 1022 bytes written - successfully after processing (for example with CRs added if the - terminal is set up that way which it is here). The same bytes will - be seen again in a later read(2), without the CRs. */ - -#define BROKEN_PTY_READ_AFTER_EAGAIN 1 diff --git a/devel/gvd/files/patch-aa b/devel/gvd/files/patch-aa deleted file mode 100644 index 2bd90fd4605a..000000000000 --- a/devel/gvd/files/patch-aa +++ /dev/null @@ -1,27 +0,0 @@ ---- gnat/Makefile.in.orig Mon Dec 4 18:56:39 2000 -+++ gnat/Makefile.in Mon Dec 4 18:57:03 2000 -@@ -4,19 +4,19 @@ - all: g-expect.o gexpect.o g-regpat.o gexpect_tty.o g-exptty.o - - g-expect.o: g-expect.adb g-expect.ads -- gcc -c -gnatg $(CFLAGS) $< -+ $(CC) -c -gnatg $(CFLAGS) $< - - gexpect.o: gexpect.c Makefile -- gcc -c $(ALL_CFLAGS) $< -+ $(CC) -c $(ALL_CFLAGS) $< - - g-regpat.o: g-regpat.adb g-regpat.ads -- gcc -c -gnatg $(CFLAGS) $< -+ $(CC) -c -gnatg $(CFLAGS) $< - - g-exptty.o: g-exptty.adb g-exptty.ads g-expect.ads -- gcc -c -gnatg $(CFLAGS) g-exptty.adb -+ $(CC) -c -gnatg $(CFLAGS) g-exptty.adb - - gexpect_tty.o: gexpect_tty.c Makefile -- gcc -c $(ALL_CFLAGS) $< -+ $(CC) -c $(ALL_CFLAGS) $< - - clean: - rm -f *.o *.ali *~ b~* diff --git a/devel/gvd/files/patch-ab b/devel/gvd/files/patch-ab new file mode 100644 index 000000000000..2266097bd027 --- /dev/null +++ b/devel/gvd/files/patch-ab @@ -0,0 +1,22 @@ +--- docs/Makefile.in.orig Wed Oct 31 15:57:19 2001 ++++ docs/Makefile.in Wed Oct 31 15:58:10 2001 +@@ -1,5 +1,6 @@ + prefix = @prefix@ +-docdir = $(prefix)/doc/gvd ++docdir = $(prefix)/share/doc/gvd ++infodir = $(prefix)/info + + MKDIR = mkdir -p + INSTALL = @INSTALL@ +@@ -24,9 +25,9 @@ + dvips gvd.dvi -o gvd.ps + + install: +- $(MKDIR) $(docdir) ++ $(MKDIR) $(docdir) $(infodir) + $(INSTALL_DATA) gvd.html $(docdir) +- $(INSTALL_DATA) gvd.info $(docdir) ++ $(INSTALL_DATA) gvd.info $(infodir) + -$(INSTALL_DATA) gvd.ps $(docdir) + $(INSTALL_DATA) gvd.txt $(docdir) + for img in $(IMAGES); do \ diff --git a/devel/gvd/pkg-plist b/devel/gvd/pkg-plist index 402da2159854..1a0f04ae831f 100644 --- a/devel/gvd/pkg-plist +++ b/devel/gvd/pkg-plist @@ -1,2 +1,19 @@ bin/gvd +@unexec install-info --delete %D/info/gvd.info %D/info/dir +info/gvd.info +@exec install-info %D/info/gvd.info %D/info/dir share/locale/fr/LC_MESSAGES/gvd.mo +share/doc/gvd/gvd.html +share/doc/gvd/gvd.ps +share/doc/gvd/gvd.txt +share/doc/gvd/assembly.gif +share/doc/gvd/canvas.gif +share/doc/gvd/explorer.gif +share/doc/gvd/memory-view.gif +share/doc/gvd/tasks.gif +share/doc/gvd/breakpoints.gif +share/doc/gvd/colors.gif +share/doc/gvd/main-window.gif +share/doc/gvd/process.gif +share/doc/gvd/tooltips.gif +@dirrm share/doc/gvd -- cgit v1.2.3