From cffb4d46b92253e0da4a6bb50da81aee1a110c49 Mon Sep 17 00:00:00 2001 From: Steve Price Date: Mon, 24 Jan 2000 05:00:57 +0000 Subject: Make some modifications for (supposedly) better portability of the "make patch"ed ${WRKSRC}: * Use _relative_ symbolic link in the source tree. * Don't use __FreeBSD__ other than to wrap fpsetmask() stuff. * #define HAS_INTWAITSTATUS for BSD4.4 PR: 15972 Submitted by: maintainer --- cad/cider/Makefile | 4 ++-- cad/cider/files/patch-aa | 19 ------------------- cad/cider/files/patch-ab | 27 ++++++++++++++++----------- cad/cider/files/patch-ar | 6 ++++-- cad/cider/files/patch-at | 2 +- cad/cider/files/patch-bb | 2 +- 6 files changed, 24 insertions(+), 36 deletions(-) (limited to 'cad') diff --git a/cad/cider/Makefile b/cad/cider/Makefile index d4ee86e02908..eaf466482040 100644 --- a/cad/cider/Makefile +++ b/cad/cider/Makefile @@ -25,8 +25,8 @@ pre-patch: @${CP} -f ${WRKSRC}/spice/common/lib/helpdir/spice.txt ${WRKSRC}/cider/common/lib/helpdir/spice.txt post-patch: - @${LN} -fs ${WRKSRC}/spice/common/util/makelib.sh ${WRKSRC}/cider/common/util - @${LN} -fs ${WRKSRC}/spice/common/src/lib/sparse/spdefs.h ${WRKSRC}/cider/common/src/include + @${LN} -fs ../../../spice/common/util/makelib.sh ${WRKSRC}/cider/common/util + @${LN} -fs ../../../../spice/common/src/lib/sparse/spdefs.h ${WRKSRC}/cider/common/src/include @${CP} -f ${FILESDIR}/Makefile.spice ${WRKSRC}/spice/common/Makefile @${CP} -f ${FILESDIR}/Makefile.cider ${WRKSRC}/cider/common/Makefile @${CP} -f ${FILESDIR}/FreeBSD ${WRKSRC}/spice/common/conf diff --git a/cad/cider/files/patch-aa b/cad/cider/files/patch-aa index 8ed1dea755de..a99d8f742fe7 100644 --- a/cad/cider/files/patch-aa +++ b/cad/cider/files/patch-aa @@ -27,22 +27,3 @@ S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin # INSTALL_DIRS lists the directories that need to be created before -*** spice/common/util/build.orig Sat Jan 29 19:16:26 1994 ---- spice/common/util/build Sun Dec 12 14:38:33 1999 -*************** -*** 96,102 **** - - TMP_LEADER="${TMP_DIR}/buildl$$" - TMP_TRAILER="${TMP_DIR}/buildt$$" -! trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 9 10 12 13 14 15 - echo > "${TMP_TRAILER}" - BAD=false - DEBUG= ---- 96,102 ---- - - TMP_LEADER="${TMP_DIR}/buildl$$" - TMP_TRAILER="${TMP_DIR}/buildt$$" -! trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 10 12 13 14 15 - echo > "${TMP_TRAILER}" - BAD=false - DEBUG= diff --git a/cad/cider/files/patch-ab b/cad/cider/files/patch-ab index f3f2012cc8ac..ff8408393e3f 100644 --- a/cad/cider/files/patch-ab +++ b/cad/cider/files/patch-ab @@ -1,14 +1,19 @@ -*** spice/common/src/lib/fte/resource.c.orig Sat Jan 29 18:48:28 1994 ---- spice/common/src/lib/fte/resource.c Sun Dec 12 14:38:33 1999 +*** spice/common/util/build.orig Sat Jan 29 19:16:26 1994 +--- spice/common/util/build Sun Dec 12 14:38:33 1999 *************** -*** 370,376 **** ---- 370,378 ---- - long x; - SIGNAL_TYPE (*orig_signal)( ); +*** 96,102 **** -+ #ifndef __FreeBSD__ - if (getenv("SPICE_NO_DATASEG_CHECK")) -+ #endif - return 0; + TMP_LEADER="${TMP_DIR}/buildl$$" + TMP_TRAILER="${TMP_DIR}/buildt$$" +! trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 9 10 12 13 14 15 + echo > "${TMP_TRAILER}" + BAD=false + DEBUG= +--- 96,102 ---- - low = 0; + TMP_LEADER="${TMP_DIR}/buildl$$" + TMP_TRAILER="${TMP_DIR}/buildt$$" +! trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 10 12 13 14 15 + echo > "${TMP_TRAILER}" + BAD=false + DEBUG= diff --git a/cad/cider/files/patch-ar b/cad/cider/files/patch-ar index 1f901f377d2a..913213835c24 100644 --- a/cad/cider/files/patch-ar +++ b/cad/cider/files/patch-ar @@ -1,5 +1,5 @@ --- spice/common/src/include/os_bsd.h.orig Sat Jan 29 19:14:37 1994 -+++ spice/common/src/include/os_bsd.h Sun Dec 26 19:05:36 1999 ++++ spice/common/src/include/os_bsd.h Thu Jan 6 12:33:20 2000 @@ -6,14 +6,22 @@ * BSD and derivative systems */ @@ -25,7 +25,7 @@ #define HAS_BCOPY /* bcopy( ), bzero( ) */ #define HAS_BSDRANDOM /* srandom( ) and random( ) */ #define HAS_BSDTTY /* */ -@@ -22,4 +30,10 @@ +@@ -22,4 +30,12 @@ #define HAS_BSDRLIMIT /* getrlimit( ) */ #define HAS_DUP2 #define HAS_GETWD /* getwd(buf) */ @@ -36,4 +36,6 @@ +#define HAS_BSDTIME /* gettimeofday( ) return time */ +#define HAS_FLOAT_H /* float.h */ +#define HAS_STRCHR /* strchr( ) instead of index( ) */ ++#define HAS_INTWAITSTATUS /* wait(3) takes an int *, not a union */ ++#undef HAS_UNIX_SEGMENT_HACK +#endif diff --git a/cad/cider/files/patch-at b/cad/cider/files/patch-at index 170b48f461e5..f772c924e45b 100644 --- a/cad/cider/files/patch-at +++ b/cad/cider/files/patch-at @@ -12,7 +12,7 @@ c |= CODEMAXY; /* XXX */ -+/* ++/* Defined in "util.h". #define MAX(a, b) (((a) > (b)) ? (a) : (b)) #define MIN(a, b) (((a) < (b)) ? (a) : (b)) +*/ diff --git a/cad/cider/files/patch-bb b/cad/cider/files/patch-bb index 850513159719..60a52501fd53 100644 --- a/cad/cider/files/patch-bb +++ b/cad/cider/files/patch-bb @@ -30,7 +30,7 @@ echo Begin build for "${SYS_NAME}" on "${BUILD_DATE}": $EXEC cat ${FILES0} "${TOP0}/${DIR}/${SUBDIR}/makedefs" \ "${TMP_TRAILER}" "${SKEL_DIR}/make_std.bd" \ -! | /usr/bin/make ${VERBOSE} -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \ +! | make ${VERBOSE} -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \ VPATH="${TOP0}/${DIR}/${SUBDIR}" CWD="${CWD}" echo Done with build at `date` else -- cgit v1.2.3