1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-24 21:01:20 +00:00
freebsd-ports/x11-toolkits/xview/files/patch-ce
Steve Price ba6754f275 Combine xview-config and xview-lib into one port, xview.
PR:		11305
Submitted by:	Pedro F. Giffuni <pfgiffun@bachue.usc.unal.edu.co>
1999-05-04 22:58:09 +00:00

152 lines
3.4 KiB
Plaintext

*** config/XView.tmpl.orig Sun Jun 26 21:10:00 1994
--- config/XView.tmpl Thu Jan 21 23:18:27 1999
***************
*** 96,102 ****
* Work around small conflict with Project.tmpl file
*/
#if UseInstalled
! MKDIRHIER = BourneShell BinDir/mkdirhier
#endif
#if OsHasLocale
--- 96,102 ----
* Work around small conflict with Project.tmpl file
*/
#if UseInstalled
! MKDIRHIER = mkdirhier
#endif
#if OsHasLocale
***************
*** 192,205 ****
AS = as
*/
/*
- * use the same trick X11R5 does for defining rules for installed libs
- */
- #ifdef UseInstalled
- #define _Use(a,b) a
- #else
- #define _Use(a,b) b
- #endif
- /*
* Temporary directory used during build process before the include
* files are installed. This is just a place where symbolic links are
* placed to point back to the actual files in the build hierarchy to
--- 192,197 ----
***************
*** 224,230 ****
* afterwards.
*/
#ifndef XVIncludeDirName
! #define XVIncludeDirName /include
#endif
INCDIR = XVIncludeDirName
/*
--- 216,222 ----
* afterwards.
*/
#ifndef XVIncludeDirName
! #define XVIncludeDirName include
#endif
INCDIR = XVIncludeDirName
/*
***************
*** 356,365 ****
#if SystemV4
SYSV_CLIENT_LIB = -lintl -ldl
! XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
#else
SYSV_CLIENT_LIB =
! XVCLIENTSYSDEFINES = -DSUNOS41
#endif
/*
--- 348,357 ----
#if SystemV4
SYSV_CLIENT_LIB = -lintl -ldl
! XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
#else
SYSV_CLIENT_LIB =
! XVCLIENTSYSDEFINES = -DSUNOS41
#endif
/*
***************
*** 371,386 ****
*/
#if XvI18nLevel == 4
! XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
! XVCLIENTMISCLIB = -lw
! XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
#else
! XVCLIENTI18NDEFINES = -DOW_I18N_L3
! XVCLIENTMISCLIB =
! XVCLIENTINCLUDES =
#endif
! XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
/*
* Define libraries for XView clients
--- 363,378 ----
*/
#if XvI18nLevel == 4
! XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
! XVCLIENTMISCLIB = -lw
! XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
#else
! XVCLIENTI18NDEFINES = -DOW_I18N_L3
! XVCLIENTMISCLIB =
! XVCLIENTINCLUDES =
#endif
! XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
/*
* Define libraries for XView clients
***************
*** 410,416 ****
*/
#if SharedLibXView
# ifndef SharedXViewRev
! #if SystemV4
# define SharedXViewRev 3
#else
# define SharedXViewRev 3.2
--- 402,408 ----
*/
#if SharedLibXView
# ifndef SharedXViewRev
! #if SystemV4 || UseElfFormat
# define SharedXViewRev 3
#else
# define SharedXViewRev 3.2
***************
*** 449,460 ****
* Include the XView specific makefile macros.
*/
- /* This is just needed here because X11 is installed with gcc as
- a default compiler.
- lumpi@dobag.in-berlin.de
-
#undef CcCmd
#define CcCmd cc
! #define LibraryCcCmd cc */
#include <XView.rules>
#endif /* XViewTmpl */
--- 441,448 ----
* Include the XView specific makefile macros.
*/
#undef CcCmd
#define CcCmd cc
! #define LibraryCcCmd cc
#include <XView.rules>
#endif /* XViewTmpl */