diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2001-12-19 13:48:31 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2001-12-19 13:48:31 +0000 |
commit | c6d341dea85d4a511ee01fec606303c6c2ac703d (patch) | |
tree | dc2eef94ea8738c15381136814dd0282e6325505 /net/netatalk/files | |
parent | Update to 1.17. (diff) |
- Update Netatalk 1.5pre8 to 1.5rc1.
- This also fixes up the build process a great deal.
PR: 32945
Submitted by: marcus@marcuscom.com
Notes
Notes:
svn path=/head/; revision=51838
Diffstat (limited to 'net/netatalk/files')
-rw-r--r-- | net/netatalk/files/patch-Makefile.in | 29 | ||||
-rw-r--r-- | net/netatalk/files/patch-configure.in | 11 |
2 files changed, 14 insertions, 26 deletions
diff --git a/net/netatalk/files/patch-Makefile.in b/net/netatalk/files/patch-Makefile.in index 15d4d58e6a76..2bced014b117 100644 --- a/net/netatalk/files/patch-Makefile.in +++ b/net/netatalk/files/patch-Makefile.in @@ -1,18 +1,17 @@ ---- config/Makefile.in.orig Thu Aug 30 12:02:31 2001 -+++ config/Makefile.in Thu Aug 30 12:03:21 2001 -@@ -136,11 +136,11 @@ +--- config/Makefile.in.orig Mon Dec 17 14:30:53 2001 ++++ config/Makefile.in Mon Dec 17 14:31:45 2001 +@@ -264,12 +264,8 @@ + install-config-files: $(CONFFILES) $(GENFILES) $(mkinstalldirs) $(DESTDIR)$(pkgconfdir) - @list='$(pkgconf_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfdir)/$$p; \ -+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfdir)/$$p.dist"; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfdir)/$$p.dist; \ - else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfdir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfdir)/$$p; \ -+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfdir)/$$p.dist"; \ -+ $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfdir)/$$p.dist; \ - fi; fi; \ + for f in $(CONFFILES) $(GENFILES); do \ +- if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \ +- echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \ +- $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \ +- else \ +- echo "not overwriting $$f"; \ +- fi; \ ++ echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist"; \ ++ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \ done + @USE_PAM_TRUE@install-data-local: install-config-files $(PAMFILES) diff --git a/net/netatalk/files/patch-configure.in b/net/netatalk/files/patch-configure.in deleted file mode 100644 index 5e280d8c8cd2..000000000000 --- a/net/netatalk/files/patch-configure.in +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig Fri Oct 5 12:38:18 2001 -+++ configure.in Fri Oct 5 12:38:33 2001 -@@ -273,7 +273,7 @@ - dnl -- also enable CNID DB when this is found - AC_DEFINE(CNID_DB, 1) - AC_MSG_RESULT([using persistent cnid database per volume]) -- LIBS="$LIBS -ldb", -+ LIBS="$LIBS -ldb3", - dnl Not Found - AC_MSG_ERROR([Berkeley DB3 library not found!]) - ) |