diff options
author | MIHIRA Sanpei Yoshiro <sanpei@FreeBSD.org> | 2003-07-09 21:53:42 +0000 |
---|---|---|
committer | MIHIRA Sanpei Yoshiro <sanpei@FreeBSD.org> | 2003-07-09 21:53:42 +0000 |
commit | c326feac8df5b40fb20da023a2d151ed9555cb39 (patch) | |
tree | b6fa4dc1047b363b8d7f501ef1f644f50ef4a021 /japanese | |
parent | Add checksum for bounds-checking-gcc-3.3-1.00.patch.bz2 lost by revision 1.69. (diff) |
Modified to build on 5-current(use gcc 2.95)
Submitted by: bento
Notes
Notes:
svn path=/head/; revision=84547
Diffstat (limited to 'japanese')
-rw-r--r-- | japanese/iv/Makefile | 9 | ||||
-rw-r--r-- | japanese/iv/files/patch-aa | 47 | ||||
-rw-r--r-- | japanese/iv/files/patch-ad | 2 | ||||
-rw-r--r-- | japanese/iv/files/patch-bd | 23 | ||||
-rw-r--r-- | japanese/iv/files/patch-be | 11 | ||||
-rw-r--r-- | japanese/iv/files/patch-bg | 30 | ||||
-rw-r--r-- | japanese/iv/files/patch-bh | 11 | ||||
-rw-r--r-- | japanese/iv/files/patch-bi | 18 | ||||
-rw-r--r-- | japanese/iv/files/patch-cc | 21 | ||||
-rw-r--r-- | japanese/iv/files/patch-cq | 20 |
10 files changed, 146 insertions, 46 deletions
diff --git a/japanese/iv/Makefile b/japanese/iv/Makefile index f3ed4aa4764e..ce0ba2b90182 100644 --- a/japanese/iv/Makefile +++ b/japanese/iv/Makefile @@ -24,6 +24,7 @@ COMMENT= A toolkit from Stanford University and Silicon Graphics + Japanese patc # Warning: we cannot use USE_IMAKE. BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake +USE_GCC= 2.95 USE_XLIB= yes DIST_SUBDIR= iv WRKSRC= ${WRKDIR}/iv @@ -78,10 +79,14 @@ IV_LIB_VER= 3.1 pre-patch: ${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/diff-2.0gamma -.if ${OSVERSION} >= 400002 post-patch: @(cd ${WRKSRC}/src/config/InterViews; ${MV} -f iv-freebsd.cf \ - iv-freebsd.cf~; ${SED} -e 's/\-lg\+\+//' iv-freebsd.cf~ > iv-freebsd.cf) + iv-freebsd.cf~; ${SED} -e 's/%%CXX%%/${CXX}/' iv-freebsd.cf~ \ + > iv-freebsd.cf) +.if ${OSVERSION} >= 400002 + @(cd ${WRKSRC}/src/config/InterViews; ${MV} -f iv-freebsd.cf \ + iv-freebsd.cf~; ${SED} -e 's/\-lg\+\+//' iv-freebsd.cf~ \ + > iv-freebsd.cf) .endif post-install: diff --git a/japanese/iv/files/patch-aa b/japanese/iv/files/patch-aa index 96341aee9226..712f5d61ae2b 100644 --- a/japanese/iv/files/patch-aa +++ b/japanese/iv/files/patch-aa @@ -1,5 +1,5 @@ -*** src/bin/iclass/dialogs.c Wed Sep 23 09:45:09 1992 ---- /usr/oports/x11/iv/src/bin/iclass/dialogs.c Sat Sep 11 09:55:17 1999 +*** src/bin/iclass/dialogs.c.orig Tue Jul 8 23:30:56 2003 +--- src/bin/iclass/dialogs.c Wed Jul 9 00:14:41 2003 *************** *** 40,51 **** @@ -14,13 +14,16 @@ } #endif ---- 40,53 ---- +--- 40,56 ---- #include <stdlib.h> #include <string.h> -+ #if __FreeBSD_cc_version < 400002 ++ #if __FreeBSD__ >= 2 ++ #include <osreldate.h> ++ #if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000) #include <osfcn.h> + #endif ++ #endif #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5) && !defined(__386BSD__) && !defined(linux) /* sigh, not all systems have this prototype */ @@ -238,17 +241,20 @@ #define DECLARE1(f,t1,a1) f(t1 a1) #define DECLARE2(f,t1,a1,t2,a2) f(t1 a1, t2 a2) #define DECLARE3(f,t1,a1,t2,a2,t3,a3) f(t1 a1, t2 a2, t3 a3) -*** src/bin/ibuild/ibcmds.c.old Fri Dec 11 20:33:25 1992 ---- src/bin/ibuild/ibcmds.c Sat Sep 11 09:52:51 1999 +*** ./src/bin/ibuild/ibcmds.c.orig Sat Dec 12 13:33:25 1992 +--- ./src/bin/ibuild/ibcmds.c Wed Jul 9 00:09:35 2003 *************** *** 86,92 **** ---- 86,98 ---- +--- 86,101 ---- #undef FileChooser #define FileChooser _lib_iv(FileChooser) -+ #if __FreeBSD_cc_version < 400002 ++ #if __FreeBSD__ >= 2 ++ #include <osreldate.h> ++ #if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000) #include <osfcn.h> + #endif ++ #endif + #if __FreeBSD_cc_version >= 400003 + #include <unistd.h> + #endif @@ -257,6 +263,29 @@ #include <stdlib.h> #include <stream.h> *************** +*** 111,119 **** + #define getwd(a) getcwd(a,MAXPATHLEN) + #endif + +! #ifdef __DECCXX + extern "C" { + int getwd(char*); + int vfork(); + int execlp(char*, ...); + int unlink(char*); +--- 120,130 ---- + #define getwd(a) getcwd(a,MAXPATHLEN) + #endif + +! #if (defined(__DECCXX) || (__FreeBSD_version > 500000)) + extern "C" { ++ #if !defined(__FreeBSD__) + int getwd(char*); ++ #endif + int vfork(); + int execlp(char*, ...); + int unlink(char*); +*************** *** 2407,2421 **** EditorInfo* installed = (EditorInfo*) toolsdialog.Installed(); EditorInfo* removed = (EditorInfo*) toolsdialog.Removed(); @@ -273,7 +302,7 @@ itoolpanel->Uninstall(removed->GetName(i)); } itoolpanel->Change(); ---- 2413,2427 ---- +--- 2418,2432 ---- EditorInfo* installed = (EditorInfo*) toolsdialog.Installed(); EditorInfo* removed = (EditorInfo*) toolsdialog.Removed(); diff --git a/japanese/iv/files/patch-ad b/japanese/iv/files/patch-ad index 6fc41679c0c8..f0a65381c448 100644 --- a/japanese/iv/files/patch-ad +++ b/japanese/iv/files/patch-ad @@ -69,7 +69,7 @@ diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/config/InterViews #undef CppCmd #define CppCmd cpp #undef CCDriver -! #define CCDriver /usr/bin/c++ +! #define CCDriver %%CXX%% #undef DependCCFlags #define DependCCFlags $(CCDEFINES) $(CCINCLUDES) -I/usr/include/g++ #undef ExtraCCLdLibs diff --git a/japanese/iv/files/patch-bd b/japanese/iv/files/patch-bd index 4fa3bd702726..5633bdd684c0 100644 --- a/japanese/iv/files/patch-bd +++ b/japanese/iv/files/patch-bd @@ -1,16 +1,19 @@ ---- src/lib/Unidraw/catalog.c.orig Sat Dec 12 13:27:55 1992 -+++ src/lib/Unidraw/catalog.c Mon Jan 3 15:13:19 2000 -@@ -57,7 +57,9 @@ +--- ./src/lib/Unidraw/catalog.c.orig Sat Dec 12 13:27:55 1992 ++++ ./src/lib/Unidraw/catalog.c Wed Jul 9 00:00:06 2003 +@@ -57,7 +57,12 @@ #include <IV-2_6/_enter.h> #include <ctype.h> -+#if __FreeBSD_cc_version < 400002 ++#if __FreeBSD__ >= 2 ++#include <osreldate.h> ++#if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000) #include <osfcn.h> +#endif ++#endif #include <stdio.h> #include <stdlib.h> #include <string.h> -@@ -65,6 +67,8 @@ +@@ -65,11 +70,13 @@ #include <strstream.h> #ifdef SYSV #include <OS/types.h> @@ -19,7 +22,13 @@ #include <unistd.h> #endif #include <sys/file.h> -@@ -1502,7 +1506,8 @@ + +-#ifdef __DECCXX ++#if (defined(__DECCXX) || (__FreeBSD_version > 500000)) + extern "C" { + extern int access(char*, int); + extern int unlink(char*); +@@ -1502,7 +1509,8 @@ in >> graylevel; } else if (graylevel == nograylevel) { @@ -29,7 +38,7 @@ if (buf[0] == '>' || sscanf(buf, "%x", &data[i]) != 1) { break; } -@@ -1610,8 +1615,9 @@ +@@ -1610,8 +1618,9 @@ } else { istrstream in(definition, strlen(definition) + 1); int data[patternHeight]; diff --git a/japanese/iv/files/patch-be b/japanese/iv/files/patch-be index 7bec291bfe9c..f817d5f16cd4 100644 --- a/japanese/iv/files/patch-be +++ b/japanese/iv/files/patch-be @@ -1,12 +1,15 @@ ---- src/lib/Unidraw/catcmds.c.orig Thu May 27 20:08:11 1999 -+++ src/lib/Unidraw/catcmds.c Thu May 27 20:08:33 1999 -@@ -42,7 +42,9 @@ +--- ./src/lib/Unidraw/catcmds.c.orig Tue Jul 8 23:30:56 2003 ++++ ./src/lib/Unidraw/catcmds.c Wed Jul 9 00:04:05 2003 +@@ -42,7 +42,12 @@ #include <InterViews/window.h> #include <OS/string.h> -+#if __FreeBSD_cc_version < 400002 ++#if __FreeBSD__ >= 2 ++#include <osreldate.h> ++#if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000) #include <osfcn.h> +#endif ++#endif #include <stdio.h> #include <stdlib.h> #include <stream.h> diff --git a/japanese/iv/files/patch-bg b/japanese/iv/files/patch-bg index e0c06e36f053..b86bd7ffa4aa 100644 --- a/japanese/iv/files/patch-bg +++ b/japanese/iv/files/patch-bg @@ -1,19 +1,33 @@ ---- src/bin/ibuild/ibcode.c.orig Tue Oct 20 02:58:01 1992 -+++ src/bin/ibuild/ibcode.c Wed Jan 5 22:35:36 2000 -@@ -41,7 +41,12 @@ +--- ./src/bin/ibuild/ibcode.c.orig Tue Oct 20 02:58:01 1992 ++++ ./src/bin/ibuild/ibcode.c Wed Jul 9 00:22:23 2003 +@@ -41,11 +41,26 @@ #include <Unidraw/Graphic/pspaint.h> #include <InterViews/shape.h> #include <InterViews/transformer.h> -+#if __FreeBSD_cc_version < 400002 ++ ++#if __FreeBSD__ >= 2 ++#include <osreldate.h> ++#if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000) #include <osfcn.h> +#endif ++#endif +#if __FreeBSD_cc_version >= 400003 +#include <stdio.h> +#endif #include <stdlib.h> #include <stream.h> #include <string.h> -@@ -362,7 +367,7 @@ + ++#if (__FreeBSD_version > 500000) ++extern "C" { ++ extern int sprintf(char * __restrict, const char * __restrict, ...); ++} ++#endif ++ + /*****************************************************************************/ + + char* FilterName (const char* name) { +@@ -362,7 +377,7 @@ ButtonStateVar* bsVar = intcomp->GetButtonStateVar(); const char* bsname = bsVar->GetName(); const char* proc = bsVar->GetFuncName(); @@ -22,7 +36,7 @@ const char* subclass = bsVar->GetSubclassName(); if (!bsVar->IsSubclass() && !_emitMain) { -@@ -375,7 +380,7 @@ +@@ -375,7 +390,7 @@ if (!_bsinitslist->Search(bsname)) { _bsinitslist->Append(bsname); @@ -31,7 +45,7 @@ out << " " << bsname; } else { out << " " << ButtonClass << "* " << bsname; -@@ -384,7 +389,7 @@ +@@ -384,7 +399,7 @@ out << bsVar->GetInitial() << ");\n"; if (!_emitMain && proc != nil && *proc != '\0') { @@ -40,7 +54,7 @@ out << " " << bsname << "->SetCoreClass(this);\n"; out <<" "<< bsname<<"->SetCoreFunc("<< "&" << coreclass; out << "::" << proc << ");\n"; -@@ -1598,10 +1603,10 @@ +@@ -1598,10 +1613,10 @@ void CodeView::BeginInstantiate (ostream& out) { InteractorComp* icomp = GetIntComp(); const char* mname = icomp->GetMemberNameVar()->GetName(); diff --git a/japanese/iv/files/patch-bh b/japanese/iv/files/patch-bh index e6ea7c2f83c6..2c0e6470c41c 100644 --- a/japanese/iv/files/patch-bh +++ b/japanese/iv/files/patch-bh @@ -1,12 +1,15 @@ ---- src/bin/ibuild/ibdialogs.c.orig Thu May 27 21:41:29 1999 -+++ src/bin/ibuild/ibdialogs.c Thu May 27 21:41:59 1999 -@@ -60,7 +60,9 @@ +--- ./src/bin/ibuild/ibdialogs.c.orig Thu Sep 24 01:43:09 1992 ++++ ./src/bin/ibuild/ibdialogs.c Wed Jul 9 00:26:21 2003 +@@ -60,7 +60,12 @@ #include <InterViews/tray.h> #include <OS/types.h> -+#if __FreeBSD_cc_version < 400002 ++#if __FreeBSD__ >= 2 ++#include <osreldate.h> ++#if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000) #include <osfcn.h> +#endif ++#endif #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/japanese/iv/files/patch-bi b/japanese/iv/files/patch-bi index aa1d3d448a98..65fc0d878333 100644 --- a/japanese/iv/files/patch-bi +++ b/japanese/iv/files/patch-bi @@ -1,20 +1,26 @@ --- src/bin/iclass/direct.c.orig Sat Dec 12 13:40:42 1992 -+++ src/bin/iclass/direct.c Mon Jan 3 15:24:22 2000 -@@ -30,11 +30,17 @@ ++++ src/bin/iclass/direct.c Wed Jul 9 00:17:58 2003 +@@ -30,13 +30,22 @@ #include <OS/string.h> #include <OS/types.h> #include <stddef.h> -+#if __FreeBSD_cc_version < 400002 ++#if __FreeBSD__ >= 2 ++#include <osreldate.h> ++#if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000) #include <osfcn.h> +#endif ++#endif #include <pwd.h> #include <string.h> #include <stdlib.h> #include <sys/stat.h> -+ + +-#ifdef __DECCXX +#if __FreeBSD_cc_version >= 400003 +#include <unistd.h> +#endif - - #ifdef __DECCXX ++ ++#if (defined(__DECCXX) || (__FreeBSD_version > 500000)) extern "C" { + extern uid_t getuid(); + extern struct passwd* getpwuid(uid_t); diff --git a/japanese/iv/files/patch-cc b/japanese/iv/files/patch-cc index d1b8204633fe..76b37cdeb951 100644 --- a/japanese/iv/files/patch-cc +++ b/japanese/iv/files/patch-cc @@ -1,16 +1,27 @@ ---- src/bin/ibuild/ibdialog.c.org Wed Oct 28 10:19:27 1992 -+++ src/bin/ibuild/ibdialog.c Wed Jan 5 22:39:32 2000 -@@ -35,6 +35,9 @@ +--- src/bin/ibuild/ibdialog.c.orig Wed Oct 28 10:19:27 1992 ++++ src/bin/ibuild/ibdialog.c Wed Jul 9 23:23:46 2003 +@@ -35,9 +35,20 @@ #include <Unidraw/unidraw.h> #include <Unidraw/viewer.h> #include <Unidraw/catalog.h> ++#if __FreeBSD__ >= 2 ++#include <osreldate.h> +#if __FreeBSD_cc_version >= 400003 +#include <stdio.h> +#endif ++#endif #include <stream.h> #include <string.h> -@@ -380,7 +383,7 @@ ++#if (__FreeBSD_version > 500000) ++extern "C" { ++ extern int sprintf(char * __restrict, const char * __restrict, ...); ++} ++#endif + /*****************************************************************************/ + + DialogClass::DialogClass (IBGraphic* gr) : MonoSceneClass(gr) { +@@ -380,7 +391,7 @@ strcat(ButtonClass, "_Button"); const char* proc = bsVar->GetFuncName(); @@ -19,7 +30,7 @@ CodeView* kidview = GetKidView(); MemberNameVar* kidname; if (kidview != nil) { -@@ -407,7 +410,7 @@ +@@ -407,7 +418,7 @@ out << "Interactor*" << coreclass; out << "::Interior() {\n"; diff --git a/japanese/iv/files/patch-cq b/japanese/iv/files/patch-cq new file mode 100644 index 000000000000..cc8ffd6a8b55 --- /dev/null +++ b/japanese/iv/files/patch-cq @@ -0,0 +1,20 @@ +--- src/lib/Dispatch/dispatcher.c.orig Thu Jul 10 00:04:15 2003 ++++ src/lib/Dispatch/dispatcher.c Thu Jul 10 00:05:36 2003 +@@ -43,12 +43,16 @@ + #include <sys/time.h> + #include <time.h> + ++#if __FreeBSD__ >= 2 ++#include <osreldate.h> ++#endif ++ + /* no standard place for this */ + extern "C" { + #if defined(hpux) + extern int select(size_t, int*, int*, int*, const struct timeval*); + #else +-#if !defined(AIXV3) && !defined(Solaris_2) && !defined(__lucid) && !defined(linux) ++#if !defined(AIXV3) && !defined(Solaris_2) && !defined(__lucid) && !defined(linux) && !(defined(__FreeBSD__) && (__FreeBSD_version > 500000)) + extern int select(int, fd_set*, fd_set*, fd_set*, const struct timeval*); + #endif + #endif |