summaryrefslogtreecommitdiff
path: root/mail/courier-imap/patches/patch-aa
blob: ec9ee85d7b9a06de7fdacf9f97dcef29a259592e (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
$NetBSD: patch-aa,v 1.14 2007/10/15 15:37:21 jlam Exp $

--- Makefile.in.orig	Sat Sep 29 14:48:20 2007
+++ Makefile.in
@@ -250,9 +250,10 @@ DIST_SUBDIRS = numlib md5 sha1 bdbobj gd
 
-sbin_SCRIPTS = sharedindexinstall sharedindexsplit
+sbin_SCRIPTS = 
 CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
 databindir = $(datadir)
-databin_SCRIPTS = mkimapdcert mkpop3dcert
-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw
-sbinPROGRAMS = imaplogin pop3login
-libexecPROGRAMS = makedatprog couriertcpd
+databin_SCRIPTS = mkimapdcert mkpop3dcert \
+	imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
+binPROGRAMS = imapd
+sbinPROGRAMS = 
+libexecPROGRAMS = imaplogin courierpop3login courierpop3d
 bin_PROGRAMS = @binPROGRAMS_exec@
@@ -260,3 +261,3 @@ sbin_PROGRAMS = @sbinPROGRAMS_exec@
 libexec_PROGRAMS = @libexecPROGRAMS_exec@
-man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
+man_MANS = courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8
 
@@ -271,5 +272,5 @@ EXTRA_DIST = 00README.NOW.OR.SUFFER READ
 sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
-	imapd.cnf pop3d.cnf quotawarnmsg.example
+	imapd.cnf pop3d.cnf
 
-libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
+libexec_SCRIPTS = 
 HTML2TXT = links -dump -no-numbering -no-references
@@ -1045,7 +1046,7 @@ sharedindexsplit: maildir/sharedindexspl
 
-pop3login$(EXEEXT): imap/pop3login$(EXEEXT)
-	cp imap/pop3login$(EXEEXT) .
+courierpop3login$(EXEEXT): imap/pop3login$(EXEEXT)
+	cp imap/pop3login$(EXEEXT) ./$@
 
-pop3d$(EXEEXT): imap/pop3d$(EXEEXT)
-	cp imap/pop3d$(EXEEXT) .
+courierpop3d$(EXEEXT): imap/pop3d$(EXEEXT)
+	cp imap/pop3d$(EXEEXT) ./$@
 
@@ -1093,4 +1094,7 @@ maildirkw.1: maildir/maildirkw.1
 
-imapd.8: imap/imapd.8
-	cp imap/imapd.8 .
+courierimapd.8: imap/imapd.8
+	cp imap/imapd.8 ./$@
+
+courierpop3d.8: imap/courierpop3d.8
+	cp imap/courierpop3d.8 .
 
@@ -1120,6 +1124,4 @@ install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
-		tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
 	$(mkinstalldirs) $(DESTDIR)$(sbindir)
-	for f in mkimapdcert mkpop3dcert ; \
+	for f in imapd-ssl imapd mkimapdcert mkpop3dcert pop3d pop3d-ssl ; \
 		do rm -f $(DESTDIR)$(sbindir)/$$f ; \
@@ -1129,17 +1131,4 @@ install-exec-local:
 install-exec-hook:
-	chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
-	mkdir -p $(DESTDIR)$(sysconfdir)/shared
-	chmod 755 $(DESTDIR)$(sysconfdir)/shared
-	mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
-	chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
 
 install-data-local: install-man
-	test -d $(DESTDIR)/etc/pam.d || exit 0 ; \
-	test -w $(DESTDIR)/etc/pam.d || exit 0 ; \
-	test -f $(DESTDIR)/etc/pam.d/imap || \
-		$(INSTALL_DATA) $(srcdir)/imap/imapd.pam \
-		$(DESTDIR)/etc/pam.d/imap || exit 1 ;\
-	test -f $(DESTDIR)/etc/pam.d/pop3 || \
-		$(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \
-		$(DESTDIR)/etc/pam.d/pop3 || exit 1
 	for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done
@@ -1150,3 +1139,2 @@ uninstall-local:
 		do rm -f $(DESTDIR)$(sbindir)/$$f ; done
-	rm -f $(DESTDIR)$(bindir)/couriertls