diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2000-06-22 13:19:33 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2000-06-22 13:19:33 +0000 |
| commit | c554962384f17b2c3ea27ca0bf0433b7e90abf73 (patch) | |
| tree | a8ec48453127e6d094b03df425a480d25224a95f /x11-servers/XttXF86srv-common/files/patch-aa | |
| parent | 002f34aa9bf83e4f0e0a8b96d7bbafad4054af01 (diff) | |
| download | ports-c554962384f17b2c3ea27ca0bf0433b7e90abf73.tar.gz ports-c554962384f17b2c3ea27ca0bf0433b7e90abf73.zip | |
Notes
Diffstat (limited to 'x11-servers/XttXF86srv-common/files/patch-aa')
| -rw-r--r-- | x11-servers/XttXF86srv-common/files/patch-aa | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/x11-servers/XttXF86srv-common/files/patch-aa b/x11-servers/XttXF86srv-common/files/patch-aa index 29dbec41bfb1..def1d4dd3fb6 100644 --- a/x11-servers/XttXF86srv-common/files/patch-aa +++ b/x11-servers/XttXF86srv-common/files/patch-aa @@ -1,29 +1,11 @@ ---- Makefile.orig Thu Oct 28 18:13:31 1999 -+++ Makefile Fri Oct 29 10:04:43 1999 -@@ -56,7 +56,8 @@ - echo "" > $(IRULESRC)/host.def; \ - fi; \ - fi; \ -- fi -+ fi -+ @echo "#include \"host.def.local\"" >> $(IRULESRC)/host.def - cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean - $(MAKE) $(MFLAGS) Makefile.boot - $(MAKE_CMD) $(MFLAGS) VerifyOS -@@ -207,7 +208,7 @@ - @echo "#define IncludeFlags -I`pwd`/exports/include"\ - >> $(IRULESRC)/host.def - @echo "#define BuildFontServerOnly YES" >> $(IRULESRC)/host.def -- @echo "$(EXTRA_HOST_DEF)" >> $(IRULESRC)/host.def -+ @echo "#include \"host.def.local\"" >> $(IRULESRC)/host.def - imake -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_EXTRA_OPTS) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) -DUseInstalled - $(MAKE) $(MFLAGS) Makefiles - $(MAKE) $(MFLAGS) clean -@@ -234,6 +235,7 @@ - @echo "#define IncludeFlags -I`pwd`/exports/include"\ - >> $(IRULESRC)/host.def - @echo "#define BuildFontLibOnly YES" >> $(IRULESRC)/host.def -+ @echo "#include \"host.def.local\"" >> $(IRULESRC)/host.def - imake -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_EXTRA_OPTS) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) -DUseInstalled - $(MAKE) $(MFLAGS) Makefiles - $(MAKE) $(MFLAGS) clean +--- programs/Xserver/Imakefile.ORIG Sun Nov 14 18:16:17 1999 ++++ programs/Xserver/Imakefile Sun Nov 14 18:17:24 1999 +@@ -161,7 +161,7 @@ + SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries DBMLibrary $(EXTRASYSLIBS) + #endif + #if HasPam +- PAMLIBS = -lpam -lpam_misc -ldl ++ PAMLIBS = -lpam + #endif + CBRT = mi/LibraryTargetName(cbrt) + STDDIRS = include dix os mi $(XPDDXDIR) $(EXTDIRS) |