3 files changed, 19 insertions, 31 deletions

diff --git a/x11-toolkits/iv/Makefile b/x11-toolkits/iv/Makefile
index c4dab82dd4ea..c27ff3095c38 100644
--- a/x11-toolkits/iv/Makefile
+++ b/x11-toolkits/iv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23.sept.1994
 # Whom:			adam
 #
-# $Id: Makefile,v $
+# $Id: Makefile,v 1.1.1.1 1994/09/24 15:33:57 adam Exp $
 #
 
 EXTRACT_SUFFIX=	.tar.Z
@@ -15,12 +15,14 @@ MAKEFILE=	makefile
 
 .if ${DISTNAME} != ${VERSION}
 pre-fetch:
-	mkdir -p ${DISTDIR}/${DISTNAME}
-	${MAKE} MASTER_SITES=ftp://interviews.stanford.edu/pub/ \
-		DISTDIR=${DISTDIR}/${DISTNAME} DISTNAME=${VERSION} fetch
-	mv ${DISTDIR}/${DISTNAME}/${VERSION}${EXTRACT_SUFFIX} \
-		${DISTDIR}/${DISTFILES}
-	rmdir ${DISTDIR}/${DISTNAME}
+	if [ -f ${DISTDIR}/${DISTNAME} ] ; then \
+	    mkdir -p ${DISTDIR}/${DISTNAME} ; \
+	    ${MAKE} MASTER_SITES=ftp://interviews.stanford.edu/pub/ \
+		DISTDIR=${DISTDIR}/${DISTNAME} DISTNAME=${VERSION} fetch ; \
+	    mv ${DISTDIR}/${DISTNAME}/${VERSION}${EXTRACT_SUFFIX} \
+		${DISTDIR}/${DISTFILES} ; \
+	    rmdir ${DISTDIR}/${DISTNAME} ; \
+	fi
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/iv/files/patch-aa b/x11-toolkits/iv/files/patch-aa
index 37897f03cdc7..3f053c293609 100644
--- a/x11-toolkits/iv/files/patch-aa
+++ b/x11-toolkits/iv/files/patch-aa
@@ -56,7 +56,7 @@
    *
    */
   #ifndef TIFFStdCDefines
-+ #if defined(FreebsdArchitecture)
++ #if defined(FreeBSDArchitecture)
 + #define TIFFStdCDefines \
 +     -DCOLORIMETRY_SUPPORT -DYCBCR_SUPPORT -DMMAP_SUPPORT \
 +     -DHAVE_IEEEFP=1 -DUSE_VARARGS=1 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
@@ -75,7 +75,7 @@
 + #ifdef __FreeBSD__
 + #undef freebsd
 + #undef FREEBSD
-+ #define FreebsdArchitecture
++ #define FreeBSDArchitecture
 + #define ArchitectureName FREEBSD
 + #define architectureName freebsd
 + #define MacroIncludeFile <InterViews/iv-freebsd.cf>
@@ -85,20 +85,6 @@
   #ifndef ArchitectureName
   XCOMM WARNING: Imakefile not configured; guessing at definitions!!!
   XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake.
-*** src/config/InterViews/iv-freebsd.cf	Wed Dec 31 16:00:00 1969
---- /usr/oports/x11/iv/src/config/InterViews/iv-freebsd.cf	Thu Jun 16 18:34:08 1994
-***************
-*** 0 ****
---- 1,9 ----
-+ #include <freebsd.cf>
-+ #include <InterViews/xparams.cf>
-+ #undef CppCmd
-+ #define CppCmd /usr/bin/cpp
-+ #undef DependCCFlags
-+ #define DependCCFlags $(CCDEFINES) $(CCINCLUDES) -I/usr/include/g++
-+ #undef ExtraCCLdLibs
-+ #define ExtraCCLdLibs -lg++
-+ #define SharedCCFlags -fpic
 *** src/config/InterViews/local.def	Tue Nov 24 12:08:51 1992
 --- /usr/oports/x11/iv/src/config/InterViews/local.def	Thu Jun 16 18:34:11 1994
 ***************
@@ -116,7 +102,7 @@
    */
 ! #include <InterViews/gcc.def>
 ! 
-! #if defined(FreebsdArchitecture)
+! #if defined(FreeBSDArchitecture)
 ! #undef HasSunOSSharedLibs
 ! #define HasSunOSSharedLibs YES
 ! #endif
@@ -129,7 +115,7 @@
   #define BuildRPCClasses YES
   #endif
   
-+ #if defined (FreebsdArchitecture)
++ #if defined (FreeBSDArchitecture)
 + #undef BuildRPCClasses
 + #define BuildRPCClasses NO
 + #endif
@@ -173,11 +159,11 @@
    */
 ! 
   #undef XConfigDir
-! #define XConfigDir /usr/X386/lib/X11/config
+! #define XConfigDir /usr/X11R6/lib/X11/config
   #undef XIncDir
-! #define XIncDir /usr/X386/include
+! #define XIncDir /usr/X11R6/include
   #undef XLibDir
-! #define XLibDir /usr/X386/lib
+! #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
@@ -187,7 +173,7 @@
   /*
    * Make a shared library.
    */
-+ #if defined(FreebsdArchitecture)
++ #if defined(FreeBSDArchitecture)
 + #define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs)	@@\
 + AOUT = Concat(lib,libname.so.rev)					@@\
 + SHARED_CCFLAGS = SharedCCFlags						@@\
diff --git a/x11-toolkits/iv/scripts/configure b/x11-toolkits/iv/scripts/configure
index 4caffef6f41a..4bd27d00f252 100644
--- a/x11-toolkits/iv/scripts/configure
+++ b/x11-toolkits/iv/scripts/configure
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
 
-touch ${WRKSRC}/src/config/freebsd.cf
 find ${WRKSRC} -name Makefile -print | xargs rm
-xpath=`/usr/bin/which imake 2>/dev/null`
+
+xpath=/usr/X11R6
 if [ -n $xpath ]; then
 	xpath=`echo $xpath | sed 's;/bin/imake$;;'`
 	sed "s;/usr/X386;$xpath;" ${WRKSRC}/makefile >${WRKSRC}/makefile.foo