Attachment 39334 Details for Bug 62038 – TenDRA.diff

[patch] TenDRA.diff

TenDRA.diff (text/plain), 13.25 KB, created by Stefan Farfeleder on 2004-01-28 18:50:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Farfeleder

Created: 2004-01-28 18:50:20 UTC

Size: 13.25 KB

patch

obsolete

>Index: ports/lang/TenDRA/Makefile
>===================================================================
>RCS file: /usr/home/ncvs/ports/lang/TenDRA/Makefile,v
>retrieving revision 1.27
>diff -u -r1.27 Makefile
>--- ports/lang/TenDRA/Makefile	8 Sep 2003 21:04:36 -0000	1.27
>+++ ports/lang/TenDRA/Makefile	28 Jan 2004 18:17:15 -0000
>@@ -7,9 +7,9 @@
> #
> 
> PORTNAME=	TenDRA
>-PORTVERSION=	4.20030825
>+PORTVERSION=	4.20040128
> CATEGORIES=	lang
>-MASTER_SITES=	ftp://ftp.allbsd.org/pub/TenDRA/snapshots/
>+MASTER_SITES=	ftp://ftp.ten15.org/pub/snapshot/
> DISTNAME=	${PORTNAME:L}-${PORTVERSION:S/4.//}
> 
> MAINTAINER=	stefan@fafoe.narf.at
>@@ -18,6 +18,8 @@
> ONLY_FOR_ARCHS=	i386
> 
> DIST_SUBDIR=	${PKGBASE}
>+MANCOMPRESSED=	yes
>+WRKSRC=		${WRKDIR}/${PORTNAME:L}
> USE_BZIP2=	yes
> USE_PERL5_BUILD=	yes
> ALL_TARGET=	# nada
>@@ -31,8 +33,16 @@
> 		TENDRA_PATH=${TENDRA_PATH}
> 
> MAN1=		calculus.1 disp.1 lexi.1 pl.1 sid.1 tcc.1 tchk.1 \
>-		tcpplus.1 tdfc2.1 tld.1 tnc.1 trans.1 tspec.1
>+		tcpplus.1 tdfc2.1 tld.1 tnc.1 tspec.1 \
>+		${TENDRA_ARCH}.freebsd.trans.1
> MAN5=		tccenv.5
>+
>+pre-extract:
>+	@if [ -n "$${MAKEOBJDIRPREFIX}" ]; then \
>+		echo "Please unset MAKEOBJDIRPREFIX in your environment, " \
>+		     "TenDRA won't compile otherwise."; \
>+		exit 1; \
>+	 fi
> 
> do-configure:
> 	cd ${WRKSRC} && make PREFIX=${PREFIX} freebsd
>Index: ports/lang/TenDRA/distinfo
>===================================================================
>RCS file: /usr/home/ncvs/ports/lang/TenDRA/distinfo,v
>retrieving revision 1.3
>diff -u -r1.3 distinfo
>--- ports/lang/TenDRA/distinfo	8 Sep 2003 21:04:36 -0000	1.3
>+++ ports/lang/TenDRA/distinfo	28 Jan 2004 18:23:15 -0000
>@@ -1 +1 @@
>-MD5 (TenDRA/tendra-20030825.tar.bz2) = 7ea9716d04d4f6bf8df11d55ca37659b
>+MD5 (TenDRA/tendra-20040128.tar.bz2) = b98c2bba70dc6fa4c1a08aa322858397
>Index: ports/lang/TenDRA/pkg-descr
>===================================================================
>RCS file: /usr/home/ncvs/ports/lang/TenDRA/pkg-descr,v
>retrieving revision 1.6
>diff -u -r1.6 pkg-descr
>--- ports/lang/TenDRA/pkg-descr	3 Jun 2003 08:16:57 -0000	1.6
>+++ ports/lang/TenDRA/pkg-descr	28 Jan 2004 17:11:47 -0000
>@@ -9,7 +9,7 @@
> ability to check programs for conformance to APIs which are not
> directly supported by system headers.
> 
>-WWW: http://www.TenDRA.org/
>+WWW: http://www.ten15.org/
> 
> -----
> * TenDRA is a registered trademark of the UK Defence Evaluation
>Index: ports/lang/TenDRA/pkg-plist
>===================================================================
>RCS file: /usr/home/ncvs/ports/lang/TenDRA/pkg-plist,v
>retrieving revision 1.12
>diff -u -r1.12 pkg-plist
>--- ports/lang/TenDRA/pkg-plist	8 Sep 2003 21:04:36 -0000	1.12
>+++ ports/lang/TenDRA/pkg-plist	28 Jan 2004 17:13:08 -0000
>@@ -1,4 +1,15 @@
>+bin/calculus
>+bin/disp
>+bin/lexi
>+bin/pl
>+bin/sid
> bin/tcc
>+bin/tchk
>+bin/tdfc2
>+bin/tld
>+bin/tnc
>+bin/trans
>+bin/tspec
> lib/TenDRA/%%TENDRA_PATH%%/bin/calculus
> lib/TenDRA/%%TENDRA_PATH%%/bin/disp
> lib/TenDRA/%%TENDRA_PATH%%/bin/lexi
>@@ -43,6 +54,7 @@
> lib/TenDRA/%%TENDRA_PATH%%/env/building
> lib/TenDRA/%%TENDRA_PATH%%/env/c
> lib/TenDRA/%%TENDRA_PATH%%/env/c++
>+lib/TenDRA/%%TENDRA_PATH%%/env/c99
> lib/TenDRA/%%TENDRA_PATH%%/env/common
> lib/TenDRA/%%TENDRA_PATH%%/env/compact
> lib/TenDRA/%%TENDRA_PATH%%/env/cose
>@@ -93,6 +105,17 @@
> lib/TenDRA/%%TENDRA_PATH%%/lib/ansi.tl
> lib/TenDRA/%%TENDRA_PATH%%/lib/bsd_extn.tl
> lib/TenDRA/%%TENDRA_PATH%%/lib/cpp.tl
>+lib/TenDRA/%%TENDRA_PATH%%/lib/diag/ansi.tl
>+lib/TenDRA/%%TENDRA_PATH%%/lib/diag/bsd_extn.tl
>+lib/TenDRA/%%TENDRA_PATH%%/lib/diag/cpp.tl
>+lib/TenDRA/%%TENDRA_PATH%%/lib/diag/gcc.tl
>+lib/TenDRA/%%TENDRA_PATH%%/lib/diag/iso.tl
>+lib/TenDRA/%%TENDRA_PATH%%/lib/diag/posix.tl
>+lib/TenDRA/%%TENDRA_PATH%%/lib/diag/posix1.tl
>+lib/TenDRA/%%TENDRA_PATH%%/lib/diag/posix2.tl
>+lib/TenDRA/%%TENDRA_PATH%%/lib/diag/svid3.tl
>+lib/TenDRA/%%TENDRA_PATH%%/lib/diag/unix95.tl
>+lib/TenDRA/%%TENDRA_PATH%%/lib/diag/xpg4.tl
> lib/TenDRA/%%TENDRA_PATH%%/lib/gcc.tl
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/ansi.api/assert.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/ansi.api/ctype.h
>@@ -202,6 +225,24 @@
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/sys/time.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/sys/types.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/tdf_alloca.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/assert.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/ctype.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/errno.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/float.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/iso646.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/limits.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/locale.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/math.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/setjmp.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/signal.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/stdarg.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/stddef.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/stdio.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/stdlib.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/string.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/time.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/wchar.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api/wctype.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/assert.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/ctype.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/dirent.h
>@@ -311,6 +352,9 @@
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/cpp.api/bad_allo.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/cpp.api/except.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/gcc.api/timeval.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/iso.api/mse.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/iso.api/mse2.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/iso.api/wint.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/ctuid.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/enums.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/getopt.h
>@@ -551,6 +595,7 @@
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/wchar.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/wordexp.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/xti.h
>+lib/TenDRA/%%TENDRA_PATH%%/lib/iso.tl
> lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/ctype.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/limits.h
> lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/stdarg.h
>@@ -579,16 +624,11 @@
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.ansi/default.pf
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.ansi/int_sizes.pf
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Literal/ansi.pf
>+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Literal/c99.pf
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Literal/trad.pf
>-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xa
>-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xc
>-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xp
>-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xs
>-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xsystem
>-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xt
>-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xw
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xa
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xc
>+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xc99
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xp
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xs
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xsystem
>@@ -596,9 +636,17 @@
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xw
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/nepc
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/not_ansi
>+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xa
>+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xc
>+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xp
>+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xs
>+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xsystem
>+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xt
>+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xw
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Promotion/ansi.pf
> lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Promotion/sign.pf
> lib/TenDRA/%%TENDRA_PATH%%/lib/svid3.tl
>+lib/TenDRA/%%TENDRA_PATH%%/lib/sys/crtp_n.o
> lib/TenDRA/%%TENDRA_PATH%%/lib/sys/libcpp.a
> lib/TenDRA/%%TENDRA_PATH%%/lib/sys/libtdf.a
> lib/TenDRA/%%TENDRA_PATH%%/lib/target_tok.tl
>@@ -606,6 +654,7 @@
> lib/TenDRA/%%TENDRA_PATH%%/lib/xpg4.tl
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/bin
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/env
>+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/diag
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/ansi.api
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/arpa
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/netinet
>@@ -614,6 +663,7 @@
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/sys
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api
>+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/iso.api
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/sys
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/sys
>@@ -624,6 +674,7 @@
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/bsd_extn.api
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/cpp.api
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/gcc.api
>+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/iso.api
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix1.api
> @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/svid3.api
>Index: ports/lang/TenDRA/files/patch-install
>===================================================================
>RCS file: /usr/home/ncvs/ports/lang/TenDRA/files/patch-install,v
>retrieving revision 1.2
>diff -u -r1.2 patch-install
>--- ports/lang/TenDRA/files/patch-install	8 Sep 2003 21:04:36 -0000	1.2
>+++ ports/lang/TenDRA/files/patch-install	24 Nov 2003 00:04:46 -0000
>@@ -1,43 +1,49 @@
>-Index: mk/base/tendra.install.mk
>-===================================================================
>-RCS file: /usr/home/stefan/tendra/cvsup/tendra/mk/base/tendra.install.mk,v
>-retrieving revision 1.19
>-diff -u -r1.19 tendra.install.mk
>---- mk/base/tendra.install.mk	18 Aug 2003 04:35:26 -0000	1.19
>-+++ mk/base/tendra.install.mk	19 Aug 2003 14:23:00 -0000
>-@@ -21,7 +21,6 @@
>+--- mk/base/tendra.install.mk.orig	Wed Aug 27 09:00:00 2003
>++++ mk/base/tendra.install.mk	Thu Aug 28 21:14:55 2003
>+@@ -24,10 +24,6 @@
>  
>  .if defined(API)
>  INSTALL_TARGETS+=	install-api
> -INSTALL_SUB+=		lib/include/${API}.api lib/include/shared/${API}.api
>+-.if defined(API_SUBDIR)
>+-INSTALL_SUB+=		${API_SUBDIR:C/^/lib\/include\/${API}.api\//}
>+-.endif
>  .endif
>  
>  .if defined(INSTALL_ENV)
>-@@ -70,14 +69,9 @@
>+@@ -102,27 +98,9 @@
>  
>  # lib/apis: our api files.
>  install-api:
>--	for i in ${.OBJDIR}.api/*.h; do \
>--		${BIN_INSTALL} $$i ${INSTALL_PREFIX}/lib/include/${API}.api; \
>+-.for i in ${API}.api shared/${API}.api
>+-	cd ${OBJ_PREFIX}/lib/apis/${i}; \
>+-	for i in *.h; do \
>+-		${BIN_CP} ${OBJ_PREFIX}/lib/apis/${i}/$$i \
>+-			${INSTALL_PREFIX}/lib/include/${i}/$$i; \
>+-		${BIN_CHMOD} ${ARGS_CHMOD_DATA} \
>+-			${INSTALL_PREFIX}/lib/include/${i}/$$i; \
> -	done
>--	for i in ${.OBJDIR:C/apis/apis\/shared/}.api/*.h; do \
>--		${BIN_INSTALL} $$i ${INSTALL_PREFIX}/lib/include/shared/${API}.api; \
>+-.endfor
>+-.if defined (API_SUBDIR)
>+-.for i in ${API_SUBDIR}
>+-	cd ${.OBJDIR}.api/${i}; \
>+-	for i in *.h; do \
>+-		${BIN_CP} ${.OBJDIR}.api/${i}/$$i \
>+-			${INSTALL_PREFIX}/lib/include/${API}.api/${i}/$$i; \
>+-		${BIN_CHMOD} ${ARGS_CHMOD_DATA} \
>+-			${INSTALL_PREFIX}/lib/include/${API}.api/${i}/$$i; \
> -	done
>--	${BIN_INSTALL} ${.OBJDIR:C/apis/apis\/lib/}/${API}.tl \
>--		${INSTALL_PREFIX}/lib
>-+	env MAKEOBJDIR=${OBJ_DIR}.api INSTALL=${BIN_INSTALL} \
>-+		MKDIR=${BIN_MKDIR} ARGS_MKDIR=${ARGS_MKDIR} \
>+-.endfor
>+-.endif
>+-
>++	env MAKEOBJDIR=${OBJ_DIR}.api MKDIR="${BIN_MKDIR} ${ARGS_MKDIR}" \
>++		CP=${BIN_CP} CHMOD="${BIN_CHMOD} ${ARGS_CHMOD_DATA}" \
> +		INSTALL_PREFIX=${INSTALL_PREFIX} make install
>  
>- # lib/env: our environment files.
>- install-env:
>-Index: src/tools/tspec/makefile.c
>-===================================================================
>-RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/tools/tspec/makefile.c,v
>-retrieving revision 1.3
>-diff -u -r1.3 makefile.c
>---- src/tools/tspec/makefile.c	12 Dec 2002 05:54:55 -0000	1.3
>-+++ src/tools/tspec/makefile.c	10 Jun 2003 12:36:12 -0000
>+ # lib/apis/lib lib/apis/lib/diag: our tl files.
>+ install-tl:
>+--- src/tools/tspec/makefile.c.orig	Mon Aug 25 09:01:13 2003
>++++ src/tools/tspec/makefile.c	Thu Aug 28 21:18:27 2003
> @@ -71,10 +71,10 @@
>   */
>  
>@@ -119,7 +125,7 @@
>  			int m;
>  			char *a = i->api;
>  			if (strneq (a, "shared/", 7)) a += 7;
>-@@ -192,7 +230,19 @@
>+@@ -192,7 +230,17 @@
>  	
>      /* End of makefile */
>      IGNORE fputs ("clean :\n\trm -f ${JFILES}\n\n", output);
>@@ -128,14 +134,12 @@
> +
> +    IGNORE fprintf (output, "install : \n"
> +					".for i in ${DIRS}\n"
>-+					"\t${MKDIR} ${ARGS_MKDIR} ${INSTALL_PREFIX}/lib/include/${i}\n"
>++					"\t${MKDIR} ${INSTALL_PREFIX}/lib/include/${i}\n"
> +					".endfor\n"
> +					".for i in ${HEADERS}\n"
>-+					"\t${INSTALL} ../${i} ${INSTALL_PREFIX}/lib/include/"
>-+					"${i:H}\n"
>-+					".endfor\n"
>-+					"\t${INSTALL} ../lib/%s/%s.tl ${INSTALL_PREFIX}/lib\n",
>-+					api, api);
>++					"\t${CP} ../${i} ${INSTALL_PREFIX}/lib/include/${i:H}\n"
>++					"\t${CP} ../${i} ${INSTALL_PREFIX}/lib/include/${i:H}\n"
>++					".endfor\n");
> +
>      IGNORE fclose (output);
>      return;

Actions: View | Diff

Attachments on bug 62038: 39334