1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00

Bring InterViews 3.1 port closer to reality... in point of fact, it

-still- doesn't build right, but it's a lot closer.
This commit is contained in:
Paul Traina 1994-11-01 03:30:10 +00:00
parent 553bd5d59f
commit c095186cb6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=305
3 changed files with 19 additions and 31 deletions

View File

@ -3,7 +3,7 @@
# Date created: 23.sept.1994 # Date created: 23.sept.1994
# Whom: adam # Whom: adam
# #
# $Id: Makefile,v $ # $Id: Makefile,v 1.1.1.1 1994/09/24 15:33:57 adam Exp $
# #
EXTRACT_SUFFIX= .tar.Z EXTRACT_SUFFIX= .tar.Z
@ -15,12 +15,14 @@ MAKEFILE= makefile
.if ${DISTNAME} != ${VERSION} .if ${DISTNAME} != ${VERSION}
pre-fetch: pre-fetch:
mkdir -p ${DISTDIR}/${DISTNAME} if [ -f ${DISTDIR}/${DISTNAME} ] ; then \
${MAKE} MASTER_SITES=ftp://interviews.stanford.edu/pub/ \ mkdir -p ${DISTDIR}/${DISTNAME} ; \
DISTDIR=${DISTDIR}/${DISTNAME} DISTNAME=${VERSION} fetch ${MAKE} MASTER_SITES=ftp://interviews.stanford.edu/pub/ \
mv ${DISTDIR}/${DISTNAME}/${VERSION}${EXTRACT_SUFFIX} \ DISTDIR=${DISTDIR}/${DISTNAME} DISTNAME=${VERSION} fetch ; \
${DISTDIR}/${DISTFILES} mv ${DISTDIR}/${DISTNAME}/${VERSION}${EXTRACT_SUFFIX} \
rmdir ${DISTDIR}/${DISTNAME} ${DISTDIR}/${DISTFILES} ; \
rmdir ${DISTDIR}/${DISTNAME} ; \
fi
.endif .endif
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -56,7 +56,7 @@
* *
*/ */
#ifndef TIFFStdCDefines #ifndef TIFFStdCDefines
+ #if defined(FreebsdArchitecture) + #if defined(FreeBSDArchitecture)
+ #define TIFFStdCDefines \ + #define TIFFStdCDefines \
+ -DCOLORIMETRY_SUPPORT -DYCBCR_SUPPORT -DMMAP_SUPPORT \ + -DCOLORIMETRY_SUPPORT -DYCBCR_SUPPORT -DMMAP_SUPPORT \
+ -DHAVE_IEEEFP=1 -DUSE_VARARGS=1 -DUSE_PROTOTYPES=1 -DUSE_CONST=1 + -DHAVE_IEEEFP=1 -DUSE_VARARGS=1 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
@ -75,7 +75,7 @@
+ #ifdef __FreeBSD__ + #ifdef __FreeBSD__
+ #undef freebsd + #undef freebsd
+ #undef FREEBSD + #undef FREEBSD
+ #define FreebsdArchitecture + #define FreeBSDArchitecture
+ #define ArchitectureName FREEBSD + #define ArchitectureName FREEBSD
+ #define architectureName freebsd + #define architectureName freebsd
+ #define MacroIncludeFile <InterViews/iv-freebsd.cf> + #define MacroIncludeFile <InterViews/iv-freebsd.cf>
@ -85,20 +85,6 @@
#ifndef ArchitectureName #ifndef ArchitectureName
XCOMM WARNING: Imakefile not configured; guessing at definitions!!! XCOMM WARNING: Imakefile not configured; guessing at definitions!!!
XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake. 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 *** 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 --- /usr/oports/x11/iv/src/config/InterViews/local.def Thu Jun 16 18:34:11 1994
*************** ***************
@ -116,7 +102,7 @@
*/ */
! #include <InterViews/gcc.def> ! #include <InterViews/gcc.def>
! !
! #if defined(FreebsdArchitecture) ! #if defined(FreeBSDArchitecture)
! #undef HasSunOSSharedLibs ! #undef HasSunOSSharedLibs
! #define HasSunOSSharedLibs YES ! #define HasSunOSSharedLibs YES
! #endif ! #endif
@ -129,7 +115,7 @@
#define BuildRPCClasses YES #define BuildRPCClasses YES
#endif #endif
+ #if defined (FreebsdArchitecture) + #if defined (FreeBSDArchitecture)
+ #undef BuildRPCClasses + #undef BuildRPCClasses
+ #define BuildRPCClasses NO + #define BuildRPCClasses NO
+ #endif + #endif
@ -173,11 +159,11 @@
*/ */
! !
#undef XConfigDir #undef XConfigDir
! #define XConfigDir /usr/X386/lib/X11/config ! #define XConfigDir /usr/X11R6/lib/X11/config
#undef XIncDir #undef XIncDir
! #define XIncDir /usr/X386/include ! #define XIncDir /usr/X11R6/include
#undef XLibDir #undef XLibDir
! #define XLibDir /usr/X386/lib ! #define XLibDir /usr/X11R6/lib
! !
*** src/config/InterViews/rules.def Thu Sep 24 15:06:33 1992 *** 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 --- /usr/oports/x11/iv/src/config/InterViews/rules.def Thu Jun 16 18:34:12 1994
@ -187,7 +173,7 @@
/* /*
* Make a shared library. * Make a shared library.
*/ */
+ #if defined(FreebsdArchitecture) + #if defined(FreeBSDArchitecture)
+ #define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ + #define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\
+ AOUT = Concat(lib,libname.so.rev) @@\ + AOUT = Concat(lib,libname.so.rev) @@\
+ SHARED_CCFLAGS = SharedCCFlags @@\ + SHARED_CCFLAGS = SharedCCFlags @@\

View File

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
# #
touch ${WRKSRC}/src/config/freebsd.cf
find ${WRKSRC} -name Makefile -print | xargs rm find ${WRKSRC} -name Makefile -print | xargs rm
xpath=`/usr/bin/which imake 2>/dev/null`
xpath=/usr/X11R6
if [ -n $xpath ]; then if [ -n $xpath ]; then
xpath=`echo $xpath | sed 's;/bin/imake$;;'` xpath=`echo $xpath | sed 's;/bin/imake$;;'`
sed "s;/usr/X386;$xpath;" ${WRKSRC}/makefile >${WRKSRC}/makefile.foo sed "s;/usr/X386;$xpath;" ${WRKSRC}/makefile >${WRKSRC}/makefile.foo