$NetBSD: patch-aa,v 1.7 2012/06/09 11:45:38 adam Exp $

--- courier/Makefile.in.orig	2011-04-04 13:07:49.000000000 +0000
+++ courier/Makefile.in
@@ -46,16 +46,16 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \
-	aliascreate$(EXEEXT) sqwebmaild$(EXEEXT) submit$(EXEEXT) \
+	aliascreate$(EXEEXT) submit$(EXEEXT) \
 	@EXTRAPKGLIB@ $(am__empty)
-webmail_PROGRAMS = webmail$(EXEEXT) webmlm$(EXEEXT)
+webmail_PROGRAMS = webmlm$(EXEEXT)
 EXTRA_PROGRAMS = courierldapaliasd$(EXEEXT)
 bin_PROGRAMS = cancelmsg$(EXEEXT) mailq$(EXEEXT) sendmail$(EXEEXT) \
 	testmxlookup$(EXEEXT) dotforward$(EXEEXT) couriermlm$(EXEEXT) \
-	webmlmd$(EXEEXT) courier-config$(EXEEXT) @couriertls@ \
+	webmlmd$(EXEEXT) courier-config$(EXEEXT) \
 	@EXTRABIN@ $(am__empty)
-sbin_PROGRAMS = courier$(EXEEXT) showconfig$(EXEEXT) \
-	showmodules$(EXEEXT) aliaslookup$(EXEEXT) @COURIERLDAPALIASD@ \
+sbin_PROGRAMS = courier$(EXEEXT) courier-showconfig$(EXEEXT) \
+	courier-showmodules$(EXEEXT) aliaslookup$(EXEEXT) @COURIERLDAPALIASD@ \
 	@EXTRASBIN@ $(am__empty)
 cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@
 subdir = .
@@ -473,29 +473,26 @@ DISTCLEANFILES = uidgid
 BUILT_SOURCES = prefix.h exec_prefix.h sysconfdir.h localstatedir.h \
 	libexecdir.h bindir.h sbindir.h datadir.h filtersocketdir.h \
 	uidgid.h configargs.h sort.h webmlmdhandlerslist.H
-extrapkglib = makedatprog courierpop3login pcpd
+extrapkglib = 
 webmaildir = $(libexecdir)/courier/webmail
 webmail_SOURCES = 
 sqwebmaild_SOURCES = 
 
 # Don't forget to change perms.sh.in, if webmailimagedir moves.
 webmailimagedir = $(datadir)/sqwebmail/images
-extrabin = maildrop lockmail reformail reformime mailbot mimegpg \
-	imapd makemime deliverquota maildirmake maildiracl maildirkw
+extrabin = 
 
 bin_SCRIPTS = webmlmd.rc
-extrasbin = couriertcpd$(EXEEXT)
-sbinscripts = sharedindexsplit sharedindexinstall webmaild
+extrasbin = 
+sbinscripts = 
 sbin_SCRIPTS = @SBINSCRIPTS@
 EXTRA_SCRIPTS = 
-sysconf_DATA = pop3d.authpam imapd.authpam webmail.authpam imapd.cnf pop3d.cnf \
+sysconf_DATA = \
 	courierd.dist @LDAPALIASRC@ \
-	imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
-	quotawarnmsg.example webmlmrc.dist
+	webmlmrc.dist
 
 databindir = $(datadir)
-databin_SCRIPTS = courierctl.start makedat makealiases makehosteddomains \
-	pop3d pop3d-ssl	mkimapdcert mkpop3dcert
+databin_SCRIPTS = courierctl.start makealiases makehosteddomains
 
 mlmdatadir = $(datadir)/couriermlm
 mlmdata_DATA = \
@@ -551,7 +548,7 @@ mlmdata_DATA = \
 	webmlmsublist.tmpl.html \
 	webmlm.tmpl.html
 
-extracmdlib = courierpop3d imaplogin
+extracmdlib = 
 cmdlibdir = @libexecdir@/courier
 
 # Subdirectories
@@ -1890,6 +1887,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$
 courierpop3login$(EXEEXT): ../imap/pop3login$(EXEEXT)
 	cp -f ../imap/pop3login$(EXEEXT) courierpop3login$(EXEEXT)
 
+courier-showconfig$(EXEEXT): showconfig$(EXEEXT)
+	cp -f showconfig$(EXEEXT) courier-showconfig$(EXEEXT)
+
+courier-showmodules$(EXEEXT): showmodules$(EXEEXT)
+	cp -f showmodules$(EXEEXT) courier-showmodules$(EXEEXT)
+
 sort.h:
 	echo '#define SORT "$(SORT)"' >sort.h
 
@@ -2045,39 +2048,21 @@ dist-hook:
 
 install-exec-hook:
 	for d in $(bindir) $(sbindir) $(libexecdir) $(libexecdir)/courier \
-		$(sysconfdir)/filters \
 		$(localstatedir) $(localstatedir)/tmp\
 		$(webmaildir)\
 		$(localstatedir)/track\
 		$(localstatedir)/msgs $(localstatedir)/msgq ; do \
 			$(mkinstalldirs) $(DESTDIR)$$d || :; done
-	$(INSTALL_SCRIPT) imapd.rc $(DESTDIR)$(datadir)/imapd
-	$(INSTALL_SCRIPT) imapd-ssl.rc $(DESTDIR)$(datadir)/imapd-ssl
-	rm -f $(DESTDIR)$(sbindir)/imapd
-	$(LN_S) $(datadir)/imapd $(DESTDIR)$(sbindir)/imapd
-	rm -f $(DESTDIR)$(sbindir)/imapd-ssl
-	$(LN_S) $(datadir)/imapd-ssl $(DESTDIR)$(sbindir)/imapd-ssl
-	rm -f $(DESTDIR)$(sbindir)/mkimapdcert
-	$(LN_S) $(datadir)/mkimapdcert $(DESTDIR)$(sbindir)/mkimapdcert
-	rm -f $(DESTDIR)$(sbindir)/mkpop3dcert
-	$(LN_S) $(datadir)/mkpop3dcert $(DESTDIR)$(sbindir)/mkpop3dcert
-	rm -f $(DESTDIR)$(bindir)/makedat
-	$(LN_S) $(datadir)/makedat $(DESTDIR)$(bindir)/makedat
-	for f in makealiases makehosteddomains pop3d pop3d-ssl \
+	for f in makealiases makehosteddomains \
 		; do rm -f $(DESTDIR)$(sbindir)/$$f ; \
 		$(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
-	rm -f $(DESTDIR)$(sbindir)/webgpg ; $(LN_S) $(datadir)/sqwebmail/webgpg $(DESTDIR)$(sbindir)/webgpg
 	$(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/webadmin
-	mkdir -p $(DESTDIR)$(sysconfdir)/shared
-	chmod 755 $(DESTDIR)$(sysconfdir)/shared
-	mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
-	chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
 
 install-data-hook:
 	-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliases
 	-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/smtpaccess
-	-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliasdir
 	echo @MAILDROP@ >$(DESTDIR)$(sysconfdir)/maildrop
+	echo @MAILDROP@ >$(DESTDIR)$(sysconfdir)/maildropfilter
 	test -f $(DESTDIR)$(sysconfdir)/enablefiltering && exit 0; \
 		echo esmtp >$(DESTDIR)$(sysconfdir)/enablefiltering
 	test -f $(DESTDIR)$(sysconfdir)/aliases/system && exit 0; \
@@ -2089,10 +2074,6 @@ install-data-hook:
 	rm -f $(DESTDIR)$(bindir)/rmail
 	$(LN_S) sendmail $(DESTDIR)$(bindir)/rmail
 	-$(mkinstalldirs) $(DESTDIR)@mandir@/man8
-	-$(mkinstalldirs) $(DESTDIR)$(webmailimagedir)
-	for f in `cat ../webmail/images/filelist` ; do \
-		$(INSTALL_DATA) $(srcdir)/../webmail/images/$$f \
-			$(DESTDIR)$(webmailimagedir) ; done
 
 install-permissions: perms.sh
 	@chmod +x perms.sh setperms.sh