diff options
Diffstat (limited to 'mail/imap-uw/files/patch-ad')
| -rw-r--r-- | mail/imap-uw/files/patch-ad | 180 |
1 files changed, 110 insertions, 70 deletions
diff --git a/mail/imap-uw/files/patch-ad b/mail/imap-uw/files/patch-ad index 69c86029fe56..1da592cee2a5 100644 --- a/mail/imap-uw/files/patch-ad +++ b/mail/imap-uw/files/patch-ad @@ -1,70 +1,110 @@ ---- Makefile.orig Tue Nov 5 01:19:13 2002 -+++ Makefile Thu Nov 28 00:11:51 2002 -@@ -148,7 +148,7 @@ - # std system standard (typically passwd file), determined by port - # two try alternative (defined by CHECKPWALT), then std - --PASSWDTYPE=std -+PASSWDTYPE=pam - - - # SSL type. Defines whether or not SSL support is on this system -@@ -215,12 +215,12 @@ - # gradually-increasing intervals, starting at 2800-2900, and becoming - # permanent at 48,300. - --EXTRACFLAGS= -+EXTRACFLAGS=-I$(PREFIX)/include/c-client - - - # Extra linker flags (additional/alternative libraries, etc.) - --EXTRALDFLAGS= -+EXTRALDFLAGS=-L$(PREFIX)/lib -lc-client4 - - - # Special make flags (e.g. to override make environment variables) -@@ -256,13 +256,7 @@ - - # Make the IMAP Toolkit - --all: SPECIALS c-client rebuild bundled -- --c-client: -- @echo Not processed yet. In a first-time build, you must specify -- @echo the system type so that the sources are properly processed. -- @false -- -+all: bundled - - SPECIALS: - echo $(SPECIALS) > SPECIALS -@@ -396,9 +390,6 @@ - @echo + In order to rectify this problem, you MUST build with: - @echo ++ SSLTYPE=$(SSLTYPE).nopwd - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- @echo -- @echo Do you want to continue this build anyway? Type y or n please: -- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac' - - sslnone: - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -@@ -411,9 +402,6 @@ - @echo ++ SSLTYPE=nopwd - @echo + You must also have OpenSSL or equivalent installed. - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- @echo -- @echo Do you want to continue this build anyway? Type y or n please: -- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac' - - - # C compiler types -@@ -434,7 +422,7 @@ - $(TOOLS)/$@ "$(LN)" src/tmail tmail - $(LN) $(TOOLS)/$@ . - --build: OSTYPE rebuild rebuildclean bundled -+build: bundled - - OSTYPE: - @echo Building c-client for $(BUILDTYPE)... +*** Makefile.orig Wed May 9 00:50:45 2007 +--- Makefile Mon Jul 23 17:45:00 2007 +*************** +*** 164,170 **** + # std system standard (typically passwd file), determined by port + # two try alternative (defined by CHECKPWALT), then std + +! PASSWDTYPE=std + + + # SSL type. Defines whether or not SSL support is on this system +--- 164,170 ---- + # std system standard (typically passwd file), determined by port + # two try alternative (defined by CHECKPWALT), then std + +! PASSWDTYPE=pam + + + # SSL type. Defines whether or not SSL support is on this system +*************** +*** 253,264 **** + # British. As of 2005, the Julian calendar and the Gregorian calendar + # diverge by 15 days. + +! EXTRACFLAGS= + + + # Extra linker flags (additional/alternative libraries, etc.) + +! EXTRALDFLAGS= + + + # Special make flags (e.g. to override make environment variables) +--- 253,264 ---- + # British. As of 2005, the Julian calendar and the Gregorian calendar + # diverge by 15 days. + +! EXTRACFLAGS=-I$(PREFIX)/include/c-client + + + # Extra linker flags (additional/alternative libraries, etc.) + +! EXTRALDFLAGS=-L$(PREFIX)/lib -lc-client4 + + + # Special make flags (e.g. to override make environment variables) +*************** +*** 294,306 **** + + # Make the IMAP Toolkit + +! all: c-client SPECIALS rebuild bundled +! +! c-client: +! @echo Not processed yet. In a first-time build, you must specify +! @echo the system type so that the sources are properly processed. +! @false +! + + SPECIALS: + echo $(SPECIALS) > SPECIALS +--- 294,300 ---- + + # Make the IMAP Toolkit + +! all: bundled + + SPECIALS: + echo $(SPECIALS) > SPECIALS +*************** +*** 559,567 **** + @echo + In order to rectify this problem, you MUST build with: + @echo ++ SSLTYPE=$(SSLTYPE).nopwd + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +- @echo +- @echo Do you want to continue this build anyway? Type y or n please: +- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac' + + nounenc: + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +--- 553,558 ---- +*************** +*** 582,590 **** + @echo ++ SSLTYPE=nopwd + @echo + You must also have OpenSSL or equivalent installed. + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +- @echo +- @echo Do you want to continue this build anyway? Type y or n please: +- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nonossl;exit 1);; esac' + + nonossl: + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +--- 573,578 ---- +*************** +*** 659,665 **** + $(TOOLS)/$@ "$(LN)" src/tmail tmail + $(LN) $(TOOLS)/$@ . + +! build: OSTYPE rebuild rebuildclean bundled + + OSTYPE: + @$(MAKE) ip$(IP) +--- 647,653 ---- + $(TOOLS)/$@ "$(LN)" src/tmail tmail + $(LN) $(TOOLS)/$@ . + +! build: bundled + + OSTYPE: + @$(MAKE) ip$(IP) |