diff options
Diffstat (limited to 'japanese/iv/files')
| -rw-r--r-- | japanese/iv/files/patch-aa | 38 | ||||
| -rw-r--r-- | japanese/iv/files/patch-ae | 43 | ||||
| -rw-r--r-- | japanese/iv/files/patch-ai | 39 | ||||
| -rw-r--r-- | japanese/iv/files/patch-aj | 14 |
4 files changed, 80 insertions, 54 deletions
diff --git a/japanese/iv/files/patch-aa b/japanese/iv/files/patch-aa index 2d5e4d9bf45e..6c23d3a589ac 100644 --- a/japanese/iv/files/patch-aa +++ b/japanese/iv/files/patch-aa @@ -165,44 +165,6 @@ #undef XLibDir ! #define XLibDir /usr/X11R6/lib ! -*** src/config/InterViews/rules.def Thu Sep 24 15:06:33 1992 ---- /usr/oports/x11/iv/src/config/InterViews/rules.def Thu Jun 16 18:34:12 1994 -*************** -*** 399,404 **** ---- 399,421 ---- - /* - * Make a shared library. - */ -+ #if defined(FreeBSDArchitecture) -+ #define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ -+ AOUT = Concat(lib,libname.so.rev) @@\ -+ SHARED_CCFLAGS = SharedCCFlags @@\ -+ @@\ -+ AllTarget(Concat(lib,libname.so.rev)) @@\ -+ @@\ -+ Concat(lib,libname.so.rev): depobjs @@\ -+ @echo "building $@" @@\ -+ $(RM) $@~ @@\ -+ $(LD) -o $@~ -Bshareable ldobjs @@\ -+ $(RM) $@ @@\ -+ $(MV) $@~ $@ @@\ -+ @@\ -+ clean:: @@\ -+ $(RM) Concat(lib,libname.so.rev) -+ #else - #ifndef NormalSunOSSharedLibraryTarget - #if OSMajorVersion < 5 - #define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ -*************** -*** 434,439 **** ---- 451,457 ---- - @@\ - clean:: @@\ - $(RM) Concat(lib,libname.so.rev) -+ #endif - #endif - #endif - *** src/lib/IV-X11/xwindow.c Mon Nov 23 12:26:43 1992 --- /usr/oports/x11/iv/src/lib/IV-X11/xwindow.c Tue Apr 26 17:03:44 1994 *************** diff --git a/japanese/iv/files/patch-ae b/japanese/iv/files/patch-ae index e481b2c8729f..1e91ffc74ad1 100644 --- a/japanese/iv/files/patch-ae +++ b/japanese/iv/files/patch-ae @@ -1,16 +1,27 @@ -*** src/lib/IV/Imakefile.orig Tue Jan 16 19:11:42 1996 ---- src/lib/IV/Imakefile Wed Jan 17 10:09:20 1996 -*************** -*** 18,28 **** - $(DISPATCH)/iohandler.$(CCSUFFIX) - #endif - -- #ifdef SharedCCFlags -- #undef SharedCCFlags -- #define SharedCCFlags -PIC -- #endif -- - INTERVIEWS = $(SRC)/../InterViews - IV_2_6 = $(SRC)/../IV-2_6 - IV_X11 = $(SRC)/../IV-X11 ---- 18,23 ---- +--- src/lib/IV/Imakefile.orig Wed Oct 7 13:46:44 1998 ++++ src/lib/IV/Imakefile Wed Oct 7 15:57:25 1998 +@@ -18,11 +18,6 @@ + $(DISPATCH)/iohandler.$(CCSUFFIX) + #endif + +-#ifdef SharedCCFlags +-#undef SharedCCFlags +-#define SharedCCFlags -PIC +-#endif +- + INTERVIEWS = $(SRC)/../InterViews + IV_2_6 = $(SRC)/../IV-2_6 + IV_X11 = $(SRC)/../IV-X11 +@@ -37,7 +32,11 @@ + $(OS)$(SLASH)*.$(CCSUFFIX) + /* TIFF not included because it can't use the same flags */ + LIB = IV +-VERSION = 3.1 ++.if ${PORTOBJFORMAT} == "elf" ++VERSION = 3 ++.else ++VERSION = 3.1 ++.endif + + KIT_CCFLAGS = KitFlags + LIBPATHS = -DIV_LIBALL='"$(ABSLIBALLDIR)"' -DX_LIBDIR='"$(XLIBDIR)"' diff --git a/japanese/iv/files/patch-ai b/japanese/iv/files/patch-ai new file mode 100644 index 000000000000..4db1c72608e3 --- /dev/null +++ b/japanese/iv/files/patch-ai @@ -0,0 +1,39 @@ +--- src/config/InterViews/rules.def.orig Fri Sep 25 07:06:33 1992 ++++ src/config/InterViews/rules.def Wed Oct 7 16:25:41 1998 +@@ -399,6 +399,28 @@ + /* + * Make a shared library. + */ ++#if defined(FreeBSDArchitecture) ++#define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ ++AOUT = Concat(lib,libname.so.rev) @@\ ++SHARED_CCFLAGS = SharedCCFlags @@\ ++ @@\ ++AllTarget(Concat(lib,libname.so.rev)) @@\ ++ @@\ ++Concat(lib,libname.so.rev): depobjs @@\ ++ @echo "building $@" @@\ ++ $(RM) $@~ @@\ ++.if $(PORTOBJFORMAT) == "elf" @@\ ++ $(CC) -shared -Wl,-soname,Concat(lib,libname.so.rev) -o $@~ ldobjs @@\ ++.else @@\ ++ $(LD) -o $@~ -Bshareable ldobjs @@\ ++.endif @@\ ++ $(RM) $@ @@\ ++ $(MV) $@~ $@ @@\ ++ $(LN) $@ Concat(lib,libname.so) @@\ ++ @@\ ++clean:: @@\ ++ $(RM) Concat(lib,libname.so.rev) ++#else + #ifndef NormalSunOSSharedLibraryTarget + #if OSMajorVersion < 5 + #define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ +@@ -434,6 +456,7 @@ + @@\ + clean:: @@\ + $(RM) Concat(lib,libname.so.rev) ++#endif + #endif + #endif + diff --git a/japanese/iv/files/patch-aj b/japanese/iv/files/patch-aj new file mode 100644 index 000000000000..b9452fd3f090 --- /dev/null +++ b/japanese/iv/files/patch-aj @@ -0,0 +1,14 @@ +--- src/lib/Unidraw/Imakefile.orig Sat Oct 31 08:32:58 1992 ++++ src/lib/Unidraw/Imakefile Wed Oct 7 15:55:02 1998 +@@ -5,7 +5,11 @@ + #ifdef InObjectCodeDir + + LIB = Unidraw ++.if ${PORTOBJFORMAT} == "elf" ++VERSION = 3 ++.else + VERSION = 3.1 ++.endif + + MakeLibrary($(LIB),$(VERSION)) + |