Date: Tue, 14 Sep 1999 16:13:13 +0900 (JST) From: sanpei@sanpei.org To: FreeBSD-gnats-submit@freebsd.org Subject: ports/13744: Update port: japanese/iv(Interviews) patch for 4-current. Message-ID: <199909140713.QAA01127@lavender.sanpei.org>
next in thread | raw e-mail | index | archive | help
>Number: 13744 >Category: ports >Synopsis: Update port: japanese/iv(Interviews) patch for 4-current. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Sep 14 00:20:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: MIHIRA Sanpei Yoshiro >Release: FreeBSD 4.0-CURRENT i386 >Organization: Keio Univ. >Environment: FreeBSD sunflower.sanpei.org 4.0-CURRENT FreeBSD 4.0-CURRENT #9: Mon Sep 13 22:12:47 JST 1999 sanpei@sunflower.sanpei.org:/usr/src/sys/compile/SUNFLOWER i386 >Description: I'm maintainer of japanese/iv(Interviews). Now C Compiler in 4-current was changed into egcs. And japanese/iv can't be built under 4-current. I create some patches which is originated in x11-toolkits/iv and japanese/iv will be compiled under 4-current with below patch. This patch has new files, please add to CVS repository. patches/patch-bd, patch-be, patch-bf, patch-bg, patch-bh, patch-bi Thank you. >How-To-Repeat: >Fix: diff -uNr /usr/ports/japanese/iv/Makefile iv/Makefile --- /usr/ports/japanese/iv/Makefile Wed Sep 1 16:11:50 1999 +++ iv/Makefile Sat Sep 11 14:38:56 1999 @@ -10,11 +10,11 @@ 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 @@ -71,6 +71,12 @@ 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 diff -uNr /usr/ports/japanese/iv/patches/patch-aa iv/patches/patch-aa --- /usr/ports/japanese/iv/patches/patch-aa Tue Oct 20 10:23:09 1998 +++ iv/patches/patch-aa Sat Sep 11 09:56:38 1999 @@ -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 <stdlib.h> + #include <string.h> + #include <osfcn.h> + + #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 <stdlib.h> + #include <string.h> ++ #if __FreeBSD_cc_version < 400002 + #include <osfcn.h> ++ #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 <osfcn.h> ++ #endif + #include <stdio.h> + #include <stdlib.h> + #include <stream.h> *************** *** 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 -uNr /usr/ports/japanese/iv/patches/patch-ae iv/patches/patch-ae --- /usr/ports/japanese/iv/patches/patch-ae Tue Oct 20 10:23:09 1998 +++ iv/patches/patch-ae Sat Sep 11 09:58:11 1999 @@ -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 -uNr /usr/ports/japanese/iv/patches/patch-aj iv/patches/patch-aj --- /usr/ports/japanese/iv/patches/patch-aj Tue Oct 20 10:23:09 1998 +++ iv/patches/patch-aj Sat Sep 11 09:59:30 1999 @@ -4,7 +4,7 @@ #ifdef InObjectCodeDir LIB = Unidraw -+.if ${PORTOBJFORMAT} == "elf" ++.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf") +VERSION = 3 +.else VERSION = 3.1 diff -uNr /usr/ports/japanese/iv/patches/patch-bd iv/patches/patch-bd --- /usr/ports/japanese/iv/patches/patch-bd Thu Jan 1 09:00:00 1970 +++ iv/patches/patch-bd Sat Sep 11 10:00:23 1999 @@ -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 <IV-2_6/_enter.h> + + #include <ctype.h> ++#if __FreeBSD_cc_version < 400002 + #include <osfcn.h> ++#endif + #include <stdio.h> + #include <stdlib.h> + #include <string.h> diff -uNr /usr/ports/japanese/iv/patches/patch-be iv/patches/patch-be --- /usr/ports/japanese/iv/patches/patch-be Thu Jan 1 09:00:00 1970 +++ iv/patches/patch-be Sat Sep 11 09:45:56 1999 @@ -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 <InterViews/window.h> + #include <OS/string.h> + ++#if __FreeBSD_cc_version < 400002 + #include <osfcn.h> ++#endif + #include <stdio.h> + #include <stdlib.h> + #include <stream.h> diff -uNr /usr/ports/japanese/iv/patches/patch-bf iv/patches/patch-bf --- /usr/ports/japanese/iv/patches/patch-bf Thu Jan 1 09:00:00 1970 +++ iv/patches/patch-bf Sat Sep 11 09:46:49 1999 @@ -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 -uNr /usr/ports/japanese/iv/patches/patch-bg iv/patches/patch-bg --- /usr/ports/japanese/iv/patches/patch-bg Thu Jan 1 09:00:00 1970 +++ iv/patches/patch-bg Sat Sep 11 09:47:41 1999 @@ -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 <Unidraw/Graphic/pspaint.h> + #include <InterViews/shape.h> + #include <InterViews/transformer.h> ++#if __FreeBSD_cc_version < 400002 + #include <osfcn.h> ++#endif + #include <stdlib.h> + #include <stream.h> + #include <string.h> diff -uNr /usr/ports/japanese/iv/patches/patch-bh iv/patches/patch-bh --- /usr/ports/japanese/iv/patches/patch-bh Thu Jan 1 09:00:00 1970 +++ iv/patches/patch-bh Sat Sep 11 09:47:43 1999 @@ -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 <InterViews/tray.h> + #include <OS/types.h> + ++#if __FreeBSD_cc_version < 400002 + #include <osfcn.h> ++#endif + #include <stdio.h> + #include <stdlib.h> + #include <string.h> diff -uNr /usr/ports/japanese/iv/patches/patch-bi iv/patches/patch-bi --- /usr/ports/japanese/iv/patches/patch-bi Thu Jan 1 09:00:00 1970 +++ iv/patches/patch-bi Sat Sep 11 09:47:45 1999 @@ -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 <OS/string.h> + #include <OS/types.h> + #include <stddef.h> ++#if __FreeBSD_cc_version < 400002 + #include <osfcn.h> ++#endif + #include <pwd.h> + #include <string.h> + #include <stdlib.h> >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199909140713.QAA01127>