cf05ce3135
- Update courier-imap to 4.16.1 - Update maildrop to 2.8.2 - Update sqwebmail to 5.8.2 - Update courier-authlib to 0.66.2 - Some plist and Makefile modernization Approved by: oliver@ (as maintainer of various of these ports) Differential Revision: https://reviews.freebsd.org/D2391
115 lines
5.3 KiB
Text
115 lines
5.3 KiB
Text
--- Makefile.in.orig 2015-04-25 13:56:37 UTC
|
|
+++ Makefile.in
|
|
@@ -83,10 +83,10 @@ PRE_UNINSTALL = :
|
|
POST_UNINSTALL = :
|
|
build_triplet = @build@
|
|
host_triplet = @host@
|
|
-@HAVE_DBLIBRARY_TRUE@am__append_1 = makedat.html
|
|
-@HAVE_DBLIBRARY_TRUE@am__append_2 = makedat.1
|
|
-@HAVE_DBLIBRARY_FALSE@am__append_3 = makedat.html
|
|
-@HAVE_DBLIBRARY_FALSE@am__append_4 = makedat.1
|
|
+@HAVE_DBLIBRARY_TRUE@am__append_1 =
|
|
+@HAVE_DBLIBRARY_TRUE@am__append_2 =
|
|
+@HAVE_DBLIBRARY_FALSE@am__append_3 =
|
|
+@HAVE_DBLIBRARY_FALSE@am__append_4 =
|
|
subdir = .
|
|
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
|
$(top_srcdir)/configure $(am__configure_deps) \
|
|
@@ -376,7 +376,7 @@ host_alias = @host_alias@
|
|
host_cpu = @host_cpu@
|
|
host_os = @host_os@
|
|
host_vendor = @host_vendor@
|
|
-htmldir = $(docdir)/html
|
|
+htmldir = $(datadir)/doc/@PACKAGE@
|
|
includedir = @includedir@
|
|
infodir = @infodir@
|
|
install_sh = @install_sh@
|
|
@@ -412,15 +412,15 @@ EXTRA_DIST = README.html INSTALL.html UP
|
|
maildroptips.txt COPYING.GPL manpage.css $(HTMLWWW)
|
|
|
|
scriptdir = $(pkgdatadir)/scripts
|
|
-DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html
|
|
+DELIVERQUOTAHTMLSOURCE = maildirquota.html maildrop-deliverquota.html
|
|
DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
|
|
-DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
|
|
+DELIVERQUOTAMAN = maildirquota.7 maildrop-deliverquota.8
|
|
MAILDROPHTML = lockmail.html maildiracl.html maildirkw.html \
|
|
- maildirmake.html maildropex.html maildir.html \
|
|
+ maildrop-maildirmake.html maildropex.html \
|
|
maildropfilter.html maildropgdbm.html maildrop.html \
|
|
mailbot.html makemime.html reformail.html reformime.html \
|
|
$(am__append_1)
|
|
-MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 \
|
|
+MAILDROPMAN = lockmail.1 maildrop-maildirmake.1 maildrop.1 mailbot.1 \
|
|
maildropex.7 maildir.5 maildropfilter.7 maildropgdbm.7 \
|
|
makemime.1 reformail.1 reformime.1 $(am__append_2)
|
|
EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
|
|
@@ -1265,21 +1265,21 @@ uninstall-man: uninstall-man1 uninstall-
|
|
|
|
install-deliverquota:
|
|
$(mkinstalldirs) $(DESTDIR)$(bindir)
|
|
- $(INSTALL_PROGRAM) libs/maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
|
|
+ $(INSTALL_PROGRAM) libs/maildir/deliverquota $(DESTDIR)$(bindir)/maildrop-deliverquota
|
|
cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
|
|
|
|
uninstall-deliverquota:
|
|
- rm -f $(DESTDIR)$(bindir)/deliverquota
|
|
+ rm -f $(DESTDIR)$(bindir)/maildrop-deliverquota
|
|
|
|
install-data-local: install-man install-deliverquota install-maildrop
|
|
|
|
uninstall-local: uninstall-deliverquota uninstall-maildrop
|
|
|
|
-deliverquota.8: libs/maildir/deliverquota.8
|
|
- cp -f libs/maildir/deliverquota.8 deliverquota.8
|
|
+maildrop-deliverquota.8: libs/maildir/deliverquota.8
|
|
+ cp -f libs/maildir/deliverquota.8 maildrop-deliverquota.8
|
|
|
|
-deliverquota.html: libs/maildir/deliverquota.html
|
|
- cp -f libs/maildir/deliverquota.html deliverquota.html
|
|
+maildrop-deliverquota.html: libs/maildir/deliverquota.html
|
|
+ cp -f libs/maildir/deliverquota.html maildrop-deliverquota.html
|
|
|
|
# In maildrop 0.74, maildirmake was installed as bindir/maildrop.maildirmake
|
|
# and a soft link was created from maildirmake to maildrop.maildirmake
|
|
@@ -1297,18 +1297,18 @@ install-maildrop:
|
|
$(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
|
|
done
|
|
$(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail
|
|
- $(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
|
|
+ $(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildrop-maildirmake
|
|
$(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime
|
|
$(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime
|
|
- test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
|
|
- $(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
|
|
- test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
|
|
- $(INSTALL_SCRIPT) libs/makedat/makedat $(DESTDIR)$(bindir)/makedat
|
|
+# test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
|
|
+# $(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
|
|
+# test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
|
|
+# $(INSTALL_SCRIPT) libs/makedat/makedat $(DESTDIR)$(bindir)/makedat
|
|
. libs/maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
|
|
. libs/maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
|
|
|
|
uninstall-maildrop:
|
|
- for f in maildrop mailbot maildirmake reformail lockmail makemime reformime; do \
|
|
+ for f in maildrop mailbot maildir-maildirmake reformail lockmail makemime reformime; do \
|
|
rm -f $(DESTDIR)$(bindir)/$$f ; \
|
|
done
|
|
test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
|
|
@@ -1362,11 +1362,11 @@ maildiracl.html: libs/maildir/maildiracl
|
|
maildirkw.html: libs/maildir/maildirkw.html
|
|
cp -f $(srcdir)/libs/maildir/maildirkw.html maildirkw.html
|
|
|
|
-maildirmake.html: libs/maildir/maildirmake.html
|
|
- cp -f libs/maildir/maildirmake.html maildirmake.html
|
|
+maildrop-maildirmake.html: libs/maildir/maildirmake.html
|
|
+ cp -f libs/maildir/maildirmake.html maildrop-maildirmake.html
|
|
|
|
-maildirmake.1: libs/maildir/maildirmake.1
|
|
- cp -f libs/maildir/maildirmake.1 .
|
|
+maildrop-maildirmake.1: libs/maildir/maildirmake.1
|
|
+ cp -f libs/maildir/maildirmake.1 maildrop-maildirmake.1
|
|
|
|
maildropex.html: libs/maildrop/maildropex.html
|
|
cp -f $(srcdir)/libs/maildrop/maildropex.html maildropex.html
|