6 files changed, 137 insertions, 64 deletions

diff --git a/japanese/iv/Makefile b/japanese/iv/Makefile
index 38b6b3346215..f3fd9e699c66 100644
--- a/japanese/iv/Makefile
+++ b/japanese/iv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23.Feb.1996
 # Whom:			sanpei@yy.cs.keio.ac.jp
 #
-# $Id: Makefile,v 1.4 1998/09/05 00:34:30 max Exp $
+# $Id: Makefile,v 1.5 1998/10/16 03:10:45 jseger Exp $
 #
 
 DISTNAME=	iv-3.1
@@ -13,14 +13,12 @@ MASTER_SITES=	ftp://interviews.stanford.edu/pub/ \
 		ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
 DISTFILES=	3.1.tar.Z iv3_1j_gamma.tar.gz
 
-MAINTAINER=	sanpei@yy.cs.keio.ac.jp
-
-BROKEN_ELF=	yes
+MAINTAINER=	sanpei@sanpei.org
 
 DIST_SUBDIR=	iv
 WRKSRC=		${WRKDIR}/iv
 PATCH_DIST_STRIP=	-p1
-MAKE_ENV+=	CPU=`make CPU`
+MAKE_ENV=	CPU=`make CPU`
 
 MANPREFIX=	${PREFIX}/interviews
 MANN=		Adjuster.n Banner.n BasicDialog.n Border.n Box2_6.n \
@@ -65,8 +63,16 @@ pre-patch:
 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
-	@${LN} -fs ../interviews/lib/libIV.so.3.1 ${PREFIX}/lib
-	@${LN} -fs ../interviews/lib/libUnidraw.so.3.1 ${PREFIX}/lib
-	${LDCONFIG} -m ${PREFIX}/lib
+	@${LN} -fs ../interviews/lib/libIV.so.${IV_LIB_VER} ${PREFIX}/lib
+	@${LN} -fs ../interviews/lib/libUnidraw.so.${IV_LIB_VER} ${PREFIX}/lib
+	@${LN} -fs ${PREFIX}/lib/libIV.so.${IV_LIB_VER} ${PREFIX}/lib/libIV.so
+	@${LN} -fs ${PREFIX}/lib/libUnidraw.so.${IV_LIB_VER} ${PREFIX}/lib/libUnidraw.so
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+IV_LIB_VER=	3
+.else
+IV_LIB_VER=	3.1
+.endif
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))
+ 
diff --git a/japanese/iv/pkg-plist b/japanese/iv/pkg-plist
index 84b43c806156..0aa16af6d2bf 100644
--- a/japanese/iv/pkg-plist
+++ b/japanese/iv/pkg-plist
@@ -1,6 +1,10 @@
 @exec ln -fs ../interviews/lib/libIV.so.3.1 %D/lib
 @exec ln -fs ../interviews/lib/libUnidraw.so.3.1 %D/lib
+@exec ln -fs %D/lib/libIV.so.3.1 %D/lib/libIV.so
+@exec ln -fs %D/lib/libUnidraw.so.3.1 %D/lib/libUnidraw.so
+@unexec rm %D/lib/libIV.so
 @unexec rm %D/lib/libIV.so.3.1
+@unexec rm %D/lib/libUnidraw.so
 @unexec rm %D/lib/libUnidraw.so.3.1
 interviews/config/InterViews/template
 interviews/config/InterViews/TIFF.def
@@ -524,5 +528,42 @@ interviews/bin/ibmkmf
 interviews/bin/ivmkmf
 interviews/bin/remind
 interviews/man/refman.PS
-@exec ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@dirrm interviews/bin
+@dirrm interviews/config/InterViews
+@dirrm interviews/config
+@dirrm interviews/include/Dispatch
+@dirrm interviews/include/IV-2_6/InterViews
+@dirrm interviews/include/IV-2_6
+@dirrm interviews/include/IV-X11
+@dirrm interviews/include/IV-look
+@dirrm interviews/include/InterViews/Bitmaps
+@dirrm interviews/include/InterViews
+@dirrm interviews/include/OS
+@dirrm interviews/include/Unidraw/Commands
+@dirrm interviews/include/Unidraw/Components
+@dirrm interviews/include/Unidraw/Graphic
+@dirrm interviews/include/Unidraw/Tools
+@dirrm interviews/include/Unidraw
+@dirrm interviews/include
+@dirrm interviews/lib/all/app-defaults
+@dirrm interviews/lib/all/doc-samples
+@dirrm interviews/lib/all/drawings
+@dirrm interviews/lib/all/ibuild-samples/Clock
+@dirrm interviews/lib/all/ibuild-samples/Grapher
+@dirrm interviews/lib/all/ibuild-samples/Meter
+@dirrm interviews/lib/all/ibuild-samples/Pie
+@dirrm interviews/lib/all/ibuild-samples/Punidraw
+@dirrm interviews/lib/all/ibuild-samples/Sted
+@dirrm interviews/lib/all/ibuild-samples/VMouse
+@dirrm interviews/lib/all/ibuild-samples/VWork
+@dirrm interviews/lib/all/ibuild-samples
+@dirrm interviews/lib/all/images
+@dirrm interviews/lib/all/logos
+@dirrm interviews/lib/all/styles
+@dirrm interviews/lib/all
+@dirrm interviews/lib
+@dirrm interviews/man/mann
+@dirrm interviews/man
+@dirrm interviews