diff options
| -rw-r--r-- | devel/imake-4/files/patch-d | 10 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-d | 10 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-z38 | 27 |
3 files changed, 45 insertions, 2 deletions
diff --git a/devel/imake-4/files/patch-d b/devel/imake-4/files/patch-d index cd1d11320f68..39662846e4ec 100644 --- a/devel/imake-4/files/patch-d +++ b/devel/imake-4/files/patch-d @@ -1,6 +1,14 @@ --- cf/FreeBSD.cf.orig Sun Jun 25 03:15:53 2000 +++ cf/FreeBSD.cf Sun Jul 16 18:22:14 2000 -@@ -356,14 +356,14 @@ +@@ -351,19 +356,22 @@ + #else + #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF + #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC ++#endif ++#ifndef HasPam ++#define HasPam YES + #endif + /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ #ifndef DefaultGcc2i386Opt #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) diff --git a/x11/XFree86-4-libraries/files/patch-d b/x11/XFree86-4-libraries/files/patch-d index a6f67765d897..38955bdd8011 100644 --- a/x11/XFree86-4-libraries/files/patch-d +++ b/x11/XFree86-4-libraries/files/patch-d @@ -19,7 +19,15 @@ /* * This doesn't work the way it does on every other system. On FreeBSD it's * only a "hint, not a demand", whatever that means. Note that this is not -@@ -356,14 +368,14 @@ +@@ -351,19 +368,22 @@ + #else + #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF + #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC ++#endif ++#ifndef HasPam ++#define HasPam YES + #endif + /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ #ifndef DefaultGcc2i386Opt #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) diff --git a/x11/XFree86-4-libraries/files/patch-z38 b/x11/XFree86-4-libraries/files/patch-z38 new file mode 100644 index 000000000000..2c8cce6ddcd2 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z38 @@ -0,0 +1,27 @@ +--- Original/xc/programs/xdm/Imakefile Tue Oct 24 12:53:55 2000 ++++ programs/xdm/Imakefile Tue Oct 24 12:52:46 2000 +@@ -75,11 +75,6 @@ + PWD_DEFINES = -DUSESHADOW -DSHADOWSUITE + #endif + +-#if HasPam +-PAM_LIBRARIES = -lpam DlLibrary +-PAM_DEFINES = -DUSE_PAM +-#endif +- + #if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture) && !defined(SGIArchitecture) + SYS_LIBRARIES3 = -lresolv + #endif +@@ -89,6 +84,11 @@ + #if defined(LinuxArchitecture) && (!UseElfFormat || LinuxShadowSuite) + SYS_LIBRARIES1 = -lshadow + #endif ++#endif ++ ++#if HasPam ++PAM_LIBRARIES = -lpam DlLibrary ++PAM_DEFINES = -DUSE_PAM + #endif + + #if defined(UltrixArchitecture) + |