From owner-freebsd-ports Fri Jan 7 11: 0: 7 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 61E54157E7 for ; Fri, 7 Jan 2000 11:00:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id LAA08500; Fri, 7 Jan 2000 11:00:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from mauve.csi.cam.ac.uk (mauve.csi.cam.ac.uk [131.111.8.38]) by hub.freebsd.org (Postfix) with ESMTP id 45DC014F04 for ; Fri, 7 Jan 2000 10:56:36 -0800 (PST) (envelope-from sa264@phy.cam.ac.uk) Received: from yamame.phy.cam.ac.uk ([131.111.79.201]) by mauve.csi.cam.ac.uk with esmtp (Exim 3.03 #1) id 126eYp-0001rI-00 for FreeBSD-gnats-submit@freebsd.org; Fri, 07 Jan 2000 18:56:31 +0000 Received: (from sa264@localhost) by yamame.phy.cam.ac.uk (8.9.3/3.7W) id SAA12728; Fri, 7 Jan 2000 18:56:29 GMT Message-Id: <200001071856.SAA12728@yamame.phy.cam.ac.uk> Date: Fri, 7 Jan 2000 18:56:29 GMT From: sa264@cam.ac.uk Reply-To: sa264@cam.ac.uk To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/15972: cad/cider: make it more portable Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 15972 >Category: ports >Synopsis: cad/cider: make it more portable >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jan 7 11:00:00 PST 2000 >Closed-Date: >Last-Modified: >Originator: AMAKAWA Shuhei >Release: FreeBSD 3.4-RELEASE i386 >Organization: University of Cambridge >Environment: FreeBSD 3.4-RELEASE i386 >Description: 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 >How-To-Repeat: Try not. >Fix: Diff attached below. Removed file: patches/patch-bd diff -uNr cider.orig/Makefile cider/Makefile --- cider.orig/Makefile Wed Dec 29 23:13:13 1999 +++ cider/Makefile Thu Jan 6 11:49:16 2000 @@ -25,8 +25,8 @@ @${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 -uNr cider.orig/patches/patch-aa cider/patches/patch-aa --- cider.orig/patches/patch-aa Wed Dec 29 23:13:13 1999 +++ cider/patches/patch-aa Tue Jan 4 16:06:15 2000 @@ -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 -uNr cider.orig/patches/patch-ab cider/patches/patch-ab --- cider.orig/patches/patch-ab Wed Dec 29 23:13:13 1999 +++ cider/patches/patch-ab Tue Jan 4 16:05:52 2000 @@ -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 -uNr cider.orig/patches/patch-ar cider/patches/patch-ar --- cider.orig/patches/patch-ar Wed Dec 29 21:32:12 1999 +++ cider/patches/patch-ar Thu Jan 6 12:34:36 2000 @@ -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 -uNr cider.orig/patches/patch-at cider/patches/patch-at --- cider.orig/patches/patch-at Wed Dec 29 21:32:12 1999 +++ cider/patches/patch-at Fri Jan 7 09:12:39 2000 @@ -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 -uNr cider.orig/patches/patch-bb cider/patches/patch-bb --- cider.orig/patches/patch-bb Wed Dec 29 23:13:23 1999 +++ cider/patches/patch-bb Thu Jan 6 11:56:38 2000 @@ -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 diff -uNr cider.orig/patches/patch-bd cider/patches/patch-bd --- cider.orig/patches/patch-bd Wed Dec 29 23:13:23 1999 +++ cider/patches/patch-bd Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ -*** cider/common/src/lib/spiceitf/resource.c.orig Sun Jan 30 01:19:49 1994 ---- cider/common/src/lib/spiceitf/resource.c Sun Dec 12 18:18:26 1999 -*************** -*** 379,385 **** ---- 379,387 ---- - long x; - SIGNAL_TYPE (*orig_signal)( ); - -+ #ifndef __FreeBSD__ - if (getenv("SPICE_NO_DATASEG_CHECK")) -+ #endif - return 0; - - low = 0; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message