$NetBSD: patch-aa,v 1.8 2010/10/18 08:42:31 pettai Exp $

--- devtools/Site/site.config.m4.orig	2010-10-18 07:58:27.000000000 +0000
+++ devtools/Site/site.config.m4
@@ -11,7 +11,7 @@
 dnl If you are encountering coredumps and want to be able to analyze them
 dnl using something like "gdb", enable this next line by deleting the "dnl"
 dnl at the front of it.
-dnl define(`confOPTIMIZE', `-g')
+@DEBUG@ define(`confOPTIMIZE', `-g')
 
 dnl Shared library for libdkim
 dnl
@@ -26,7 +26,7 @@
 dnl the package, enable this next line by deleting the "dnl" at the front
 dnl of it.  This is done automatically if you've requested the shared
 dnl library.
-dnl define(`bld_LIBDKIM_INSTALL', `true')
+define(`bld_LIBDKIM_INSTALL', `true')
 
 dnl Use native strlcat()/strlcpy() functions
 dnl
@@ -37,7 +37,7 @@
 dnl On the other hand, you can just use your native strlcat() and strlcpy()
 dnl if you have them, avoiding this dependency.  If that's the case, enable
 dnl this next line by deleting the "dnl" at the front of it.
-dnl APPENDDEF(`confENVDEF', `-DWITHOUT_LIBSM')
+@WITHOUTLIBSM@ APPENDDEF(`confENVDEF', `-DWITHOUT_LIBSM')
 
 dnl Faster strtoul()/strtoull() implementations
 dnl
@@ -53,7 +53,7 @@
 dnl 
 dnl If you want to use the provided asynchronous resolver library, enable this
 dnl next line by deleting the "dnl" at the front of it.
-dnl define(`bld_USE_ARLIB', `true')
+@ARLIB@ define(`bld_USE_ARLIB', `true')
 dnl 
 dnl libar normally uses res_init() or res_ninit() to load the contents
 dnl of resolv.conf for its use.  If neither of these work on your system
@@ -62,7 +62,7 @@
 dnl also be required if you've got any IPv6 addresses in /etc/resolv.conf.
 dnl In that case, enable this next line by deleting the "dnl" at the front
 dnl of it.
-dnl APPENDDEF(`conf_libar_ENVDEF', `-DAR_RES_MANUAL')
+@ARLIB@ APPENDDEF(`conf_libar_ENVDEF', `-DAR_RES_MANUAL')
 
 dnl libunbound -- "unbound" asynchronous resolver library
 dnl
@@ -79,6 +79,14 @@
 dnl can find your installation.
 dnl APPENDDEF(`confINCDIRS', `-I/usr/local/unbound/include ')
 dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/unbound/lib ')
+APPENDDEF(`confINCDIRS', `-I@SSLBASE@/include ')                       
+APPENDDEF(`confLIBDIRS', `-L@SSLBASE@/lib ')                           
+
+dnl pthread support                  
+dnl                                  
+APPENDDEF(`confLIBS', `@PTHREAD_LDFLAGS@ ')                            
+APPENDDEF(`confINCDIRS', `-I@PTHREAD@/include ')                       
+APPENDDEF(`confLIBDIRS', `-L@PTHREAD@/lib ') 
 
 dnl POPAUTH -- POP-before-SMTP authentication
 dnl
@@ -146,9 +154,10 @@
 dnl APPENDDEF(`confENVDEF', `-D_FFR_REPORT_INTERVALS ')
 dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ')
 dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECTOR_HEADER ')
-dnl APPENDDEF(`confENVDEF', `-D_FFR_STATS ')
-dnl APPENDDEF(`confENVDEF', `-D_FFR_VBR ')
+@STATS@ APPENDDEF(`confENVDEF', `-D_FFR_STATS ')
+@VBR@ APPENDDEF(`confENVDEF', `-D_FFR_VBR ')
 dnl APPENDDEF(`confENVDEF', `-D_FFR_ZTAGS ')
+@INET6@ APPENDDEF(`confENVDEF', `-DNETINET6 ')
 
 dnl DomainKeys -- Yahoo DomainKeys verification support
 dnl 
@@ -164,6 +173,8 @@
 dnl front of them.
 dnl APPENDDEF(`bld_dkim_filter_INCDIRS', `-I/usr/local/sendmail/include')
 dnl APPENDDEF(`bld_dkim_filter_LIBDIRS', `-L/usr/local/sendmail/lib')
+APPENDDEF(`bld_dkim_filter_INCDIRS', `-I@LMBASE@/include')             
+APPENDDEF(`bld_dkim_filter_LIBDIRS', `-L@LMBASE@/lib') 
 
 dnl smfi_addheader() -- older versions of libmilter
 dnl
@@ -172,3 +183,22 @@
 dnl instead.  It will still work, but it breaks the DKIM specification.
 dnl To enable this, remove the "dnl" from the front of the line.
 dnl APPENDDEF(`conf_dkim_filter_ENVDEF', `-DNO_SMFI_INSHEADER ')
+
+dnl path fixes for pkgsrc            
+dnl                                  
+define(`confINCLUDEDIR', `@PREFIX@/include')                           
+define(`confLIBDIR', `@PREFIX@/lib') 
+define(`confSBINDIR', `@PREFIX@/sbin')
+define(`confUBINDIR', `@PREFIX@/bin')
+define(`confEBINDIR', `@PREFIX@/libexec')                              
+define(`confMANROOT', `@PREFIX@/@PKGMANDIR@/man')                      
+define(`confMANROOTMAN', `@PREFIX@/@PKGMANDIR@/man')                   
+define(`confMAN4EXT', `3')           
+define(`confMAN5EXT', `5')           
+define(`confMAN8EXT', `8')           
+define(`confINSTALL_RAWMAN', 'yes')  
+define(`confDONT_INSTALL_CATMAN', 'yes')
+                                     
+dnl option fixes for pkgsrc          
+dnl                                  
+define(`confLIBSEARCH', `@DBLIB@ @RESOLVLIB@')