summaryrefslogtreecommitdiff
path: root/mail/courier-mta/patches/patch-aa
blob: 2b90850127ea776b5219b98c8edda80df62a2237 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
$NetBSD: patch-aa,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $

--- courier/Makefile.in.orig	2006-02-25 12:28:53.000000000 -0500
+++ courier/Makefile.in
@@ -52,16 +52,16 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \
-	aliascreate$(EXEEXT) sqwebmaild$(EXEEXT) submit$(EXEEXT) \
-	@EXTRAPKGLIB@ $(am__empty)
-webmail_PROGRAMS = webmail$(EXEEXT)
+	aliascreate$(EXEEXT) submit$(EXEEXT) \
+	$(am__empty)
+webmail_PROGRAMS = 
 EXTRA_PROGRAMS = courierldapaliasd$(EXEEXT)
 bin_PROGRAMS = cancelmsg$(EXEEXT) mailq$(EXEEXT) sendmail$(EXEEXT) \
 	testmxlookup$(EXEEXT) dotforward$(EXEEXT) couriermlm$(EXEEXT) \
-	courier-config$(EXEEXT) @couriertls@ @EXTRABIN@
+	courier-config$(EXEEXT)
 sbin_PROGRAMS = courier$(EXEEXT) showconfig$(EXEEXT) \
-	showmodules$(EXEEXT) @COURIERLDAPALIASD@ @EXTRASBIN@
-cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@
+	showmodules$(EXEEXT) @COURIERLDAPALIASD@
+cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT)
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/courier.h.in $(srcdir)/courierctl.start.in \
@@ -397,7 +397,7 @@ RFCERRTXTIN = rfcerrheader.txt
 RFCERRTXTNOIN = rfcerr2045.txt rfcerr2046.txt rfcerr2047.txt
 extrapkglib = makedatprog courierpop3login pcpd
 pkglibexecdir = $(libexecdir)/courier
-webmaildir = $(libexecdir)/courier/webmail
+webmaildir = $(pkglibexecdir)/cgi-bin
 webmail_SOURCES = 
 sqwebmaild_SOURCES = 
 
@@ -408,16 +408,14 @@ extrabin = maildrop lockmail reformail r
 
 extrasbin = couriertcpd$(EXEEXT)
 sbinscripts = sharedindexsplit sharedindexinstall webmaild
-sbin_SCRIPTS = @SBINSCRIPTS@
+sbin_SCRIPTS = 
 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 $(RFCERRTXTNOIN) $(RFCERRTXTIN)
+	$(RFCERRTXTNOIN) $(RFCERRTXTIN)
 
 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 = adminrequest.tmpl confsubj.tmpl digestsubj.tmpl fetch.tmpl \
@@ -1657,27 +1655,10 @@ install-exec-hook:
 		$(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_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/courierwebadmin
 
 install-data-hook:
 	-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliases
@@ -1695,10 +1676,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