From 418136972c475af8b1ae8a8650bdcd148a372861 Mon Sep 17 00:00:00 2001 From: Satoshi Taoka Date: Mon, 20 Sep 1999 05:36:53 +0000 Subject: Modified to build on 4-current PR: 13744 Submiited by: maintainer --- japanese/iv/Makefile | 12 +++++++++--- japanese/iv/files/patch-aa | 38 +++++++++++++++++++++++++++++++------- japanese/iv/files/patch-ae | 2 +- japanese/iv/files/patch-aj | 2 +- japanese/iv/files/patch-bd | 12 ++++++++++++ japanese/iv/files/patch-be | 12 ++++++++++++ japanese/iv/files/patch-bf | 11 +++++++++++ japanese/iv/files/patch-bg | 12 ++++++++++++ japanese/iv/files/patch-bh | 12 ++++++++++++ japanese/iv/files/patch-bi | 12 ++++++++++++ 10 files changed, 113 insertions(+), 12 deletions(-) create mode 100644 japanese/iv/files/patch-bd create mode 100644 japanese/iv/files/patch-be create mode 100644 japanese/iv/files/patch-bf create mode 100644 japanese/iv/files/patch-bg create mode 100644 japanese/iv/files/patch-bh create mode 100644 japanese/iv/files/patch-bi (limited to 'japanese') diff --git a/japanese/iv/Makefile b/japanese/iv/Makefile index 5d96fa4f35a8..e04aa0db258b 100644 --- a/japanese/iv/Makefile +++ b/japanese/iv/Makefile @@ -10,11 +10,11 @@ DISTNAME= iv-3.1 PKGNAME= ja-iv-3.1 CATEGORIES= japanese graphics MASTER_SITES= ftp://interviews.stanford.edu/pub/ \ - ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ + ${MASTER_SITE_PORTS_JP} DISTFILES= 3.1.tar.Z iv3_1j_gamma.tar.gz -PATCH_SITES= ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ -PATCHFILES= iv-3.1j-gamma-fixcmpfont.patch +PATCH_SITES= ${MASTER_SITE_PORTS_JP} +PATCHFILES= iv-3.1j-gamma-fixcmpfont.patch PATCH_DIST_STRIP= -p1 MAINTAINER= sanpei@sanpei.org @@ -72,6 +72,12 @@ 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) +.endif + post-install: @${INSTALL_DATA} ${WRKDIR}/idraw-3_1j.ad ${PREFIX}/interviews/lib/all/app-defaults/idraw # need these in ${PREFIX}/lib so that ldconfig can find them diff --git a/japanese/iv/files/patch-aa b/japanese/iv/files/patch-aa index 6c23d3a589ac..bcd21e89061e 100644 --- a/japanese/iv/files/patch-aa +++ b/japanese/iv/files/patch-aa @@ -1,16 +1,28 @@ *** src/bin/iclass/dialogs.c Wed Sep 23 09:45:09 1992 ---- /usr/oports/x11/iv/src/bin/iclass/dialogs.c Tue Apr 26 17:01:39 1994 +--- /usr/oports/x11/iv/src/bin/iclass/dialogs.c Sat Sep 11 09:55:17 1999 *************** -*** 45,51 **** - #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5) +*** 40,51 **** + + #include + #include + #include + + #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5) && !defined(__386BSD__) && !defined(linux) /* sigh, not all systems have this prototype */ extern "C" { ! char* getcwd(char*, int); } #endif ---- 45,51 ---- - #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5) +--- 40,53 ---- + + #include + #include ++ #if __FreeBSD_cc_version < 400002 + #include ++ #endif + + #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5) && !defined(__386BSD__) && !defined(linux) /* sigh, not all systems have this prototype */ extern "C" { ! char* getcwd(char*, unsigned int); @@ -227,7 +239,19 @@ #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 Wed Nov 13 06:38:33 1996 +--- src/bin/ibuild/ibcmds.c Sat Sep 11 09:52:51 1999 +*************** +*** 86,92 **** +--- 86,94 ---- + #undef FileChooser + #define FileChooser _lib_iv(FileChooser) + ++ #if __FreeBSD_cc_version < 400002 + #include ++ #endif + #include + #include + #include *************** *** 2407,2415 **** EditorInfo* installed = (EditorInfo*) toolsdialog.Installed(); @@ -239,7 +263,7 @@ ToolPanel* itoolpanel = iEd->GetToolPanel(); for (int i = 0; i < installed->Count(); i++) { ---- 2407,2415 ---- +--- 2409,2417 ---- EditorInfo* installed = (EditorInfo*) toolsdialog.Installed(); EditorInfo* removed = (EditorInfo*) toolsdialog.Removed(); diff --git a/japanese/iv/files/patch-ae b/japanese/iv/files/patch-ae index 1e91ffc74ad1..37d98d34bf5b 100644 --- a/japanese/iv/files/patch-ae +++ b/japanese/iv/files/patch-ae @@ -17,7 +17,7 @@ /* TIFF not included because it can't use the same flags */ LIB = IV -VERSION = 3.1 -+.if ${PORTOBJFORMAT} == "elf" ++.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf") +VERSION = 3 +.else +VERSION = 3.1 diff --git a/japanese/iv/files/patch-aj b/japanese/iv/files/patch-aj index b9452fd3f090..caf9f4d27970 100644 --- a/japanese/iv/files/patch-aj +++ b/japanese/iv/files/patch-aj @@ -4,7 +4,7 @@ #ifdef InObjectCodeDir LIB = Unidraw -+.if ${PORTOBJFORMAT} == "elf" ++.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf") +VERSION = 3 +.else VERSION = 3.1 diff --git a/japanese/iv/files/patch-bd b/japanese/iv/files/patch-bd new file mode 100644 index 000000000000..526b30db6b8d --- /dev/null +++ b/japanese/iv/files/patch-bd @@ -0,0 +1,12 @@ +--- src/lib/Unidraw/catalog.c.orig Thu May 27 20:04:40 1999 ++++ src/lib/Unidraw/catalog.c Thu May 27 20:06:39 1999 +@@ -57,7 +57,9 @@ + #include + + #include ++#if __FreeBSD_cc_version < 400002 + #include ++#endif + #include + #include + #include diff --git a/japanese/iv/files/patch-be b/japanese/iv/files/patch-be new file mode 100644 index 000000000000..7bec291bfe9c --- /dev/null +++ b/japanese/iv/files/patch-be @@ -0,0 +1,12 @@ +--- 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 @@ + #include + #include + ++#if __FreeBSD_cc_version < 400002 + #include ++#endif + #include + #include + #include diff --git a/japanese/iv/files/patch-bf b/japanese/iv/files/patch-bf new file mode 100644 index 000000000000..27821508cb62 --- /dev/null +++ b/japanese/iv/files/patch-bf @@ -0,0 +1,11 @@ +--- src/bin/dclock/clocktime.c.orig Thu May 27 21:32:07 1999 ++++ src/bin/dclock/clocktime.c Thu May 27 21:33:07 1999 +@@ -55,7 +55,7 @@ + #if defined(hpux) || defined(AIXV3) + local = * localtime((time_t*) &gmt.tv_sec); + #else +-#ifdef __DECCXX ++#if defined(__DECCXX) || defined(__FreeBSD__) + local = * localtime((time_t*)&gmt.tv_sec); + #else + local = * localtime(&gmt.tv_sec); diff --git a/japanese/iv/files/patch-bg b/japanese/iv/files/patch-bg new file mode 100644 index 000000000000..b3cb80357b51 --- /dev/null +++ b/japanese/iv/files/patch-bg @@ -0,0 +1,12 @@ +--- src/bin/ibuild/ibcode.c.orig Thu May 27 21:37:28 1999 ++++ src/bin/ibuild/ibcode.c Thu May 27 21:38:01 1999 +@@ -41,7 +41,9 @@ + #include + #include + #include ++#if __FreeBSD_cc_version < 400002 + #include ++#endif + #include + #include + #include diff --git a/japanese/iv/files/patch-bh b/japanese/iv/files/patch-bh new file mode 100644 index 000000000000..e6ea7c2f83c6 --- /dev/null +++ b/japanese/iv/files/patch-bh @@ -0,0 +1,12 @@ +--- 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 @@ + #include + #include + ++#if __FreeBSD_cc_version < 400002 + #include ++#endif + #include + #include + #include diff --git a/japanese/iv/files/patch-bi b/japanese/iv/files/patch-bi new file mode 100644 index 000000000000..1d957ffda908 --- /dev/null +++ b/japanese/iv/files/patch-bi @@ -0,0 +1,12 @@ +--- src/bin/iclass/direct.c.orig Thu May 27 21:46:51 1999 ++++ src/bin/iclass/direct.c Thu May 27 21:47:19 1999 +@@ -30,7 +30,9 @@ + #include + #include + #include ++#if __FreeBSD_cc_version < 400002 + #include ++#endif + #include + #include + #include -- cgit v1.2.3