1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-27 10:03:20 +00:00

- Update Netatalk 1.5pre8 to 1.5rc1.

- This also fixes up the build process a great deal.

PR:		32945
Submitted by:	marcus@marcuscom.com
This commit is contained in:
Dirk Meyer 2001-12-19 13:48:31 +00:00
parent 32d9caa3d1
commit c6d341dea8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=51838
8 changed files with 42 additions and 82 deletions

View File

@ -6,12 +6,11 @@
#
PORTNAME= netatalk
PORTVERSION= 1.5p8
PORTREVISION= 2
PORTVERSION= 1.5r1
CATEGORIES= net print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= netatalk
DISTNAME= netatalk-1.5pre8
DISTNAME= netatalk-1.5rc1
MAINTAINER= marcus@marcuscom.com
@ -48,18 +47,15 @@ CONFIGURE_ARGS+= --with-flock-locks
# Configure EXPERIMENTAL CNID DID support. This is an attmept to make
# DIDs more persistent by using a Berkeley database to store the DID values.
# This should hopefully allow aliases to work between restarts of afpd.
# This has been tested on MacOS 9.2.1. I have not gotten working on OS X.
CONFIGURE_ARGS+= --enable-cnid-db \
# This has been tested on MacOS 9.2.x and OS X.
CONFIGURE_ARGS+= --with-did=cnid \
--with-db3=/usr/local
.else
# This method of DID calculation is not persistent, but has been tested to
# work with MacOS X (10.0.4 and 10.1) as well as MacOS 7-9.2.1.
# work with MacOS X (10.0.3-10.1.1) as well as MacOS 7-9.2.2.
CONFIGURE_ARGS+= --with-did=last
.endif
USE_AUTOMAKE= yes
AUTOMAKE_ARGS= --add-missing --no-force
USE_LIBTOOL= yes
LIBTOOLFILES= configure
GNU_CONFIGURE= yes
USE_GMAKE= yes
FILES= AppleVolumes.default AppleVolumes.system afpd.conf \
atalkd.conf papd.conf
@ -79,10 +75,6 @@ MAN8= afpd.8 atalkd.8 pap.8 papd.8 papstatus.8 psf.8 timelord.8
post-extract:
@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/netatalk.sh \
> ${WRKSRC}/netatalk.sh
@${RM} -f ${WRKSRC}/missing ${WRKSRC}/mkinstalldirs
post-configure:
@find ${WRKSRC} -type f | xargs ${TOUCH} -f
post-install:
@${RM} -f ${PREFIX}/bin/nu ${PREFIX}/bin/lp2pap.sh \

View File

@ -1 +1 @@
MD5 (netatalk-1.5pre8.tar.gz) = 5abc43625a4efa19ac4bf1a10bebab69
MD5 (netatalk-1.5rc1.tar.gz) = 66cba4ab02b37ea1fa1ff245e4669f2a

View File

@ -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)

View File

@ -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!])
)

View File

@ -6,12 +6,11 @@
#
PORTNAME= netatalk
PORTVERSION= 1.5p8
PORTREVISION= 2
PORTVERSION= 1.5r1
CATEGORIES= net print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= netatalk
DISTNAME= netatalk-1.5pre8
DISTNAME= netatalk-1.5rc1
MAINTAINER= marcus@marcuscom.com
@ -48,18 +47,15 @@ CONFIGURE_ARGS+= --with-flock-locks
# Configure EXPERIMENTAL CNID DID support. This is an attmept to make
# DIDs more persistent by using a Berkeley database to store the DID values.
# This should hopefully allow aliases to work between restarts of afpd.
# This has been tested on MacOS 9.2.1. I have not gotten working on OS X.
CONFIGURE_ARGS+= --enable-cnid-db \
# This has been tested on MacOS 9.2.x and OS X.
CONFIGURE_ARGS+= --with-did=cnid \
--with-db3=/usr/local
.else
# This method of DID calculation is not persistent, but has been tested to
# work with MacOS X (10.0.4 and 10.1) as well as MacOS 7-9.2.1.
# work with MacOS X (10.0.3-10.1.1) as well as MacOS 7-9.2.2.
CONFIGURE_ARGS+= --with-did=last
.endif
USE_AUTOMAKE= yes
AUTOMAKE_ARGS= --add-missing --no-force
USE_LIBTOOL= yes
LIBTOOLFILES= configure
GNU_CONFIGURE= yes
USE_GMAKE= yes
FILES= AppleVolumes.default AppleVolumes.system afpd.conf \
atalkd.conf papd.conf
@ -79,10 +75,6 @@ MAN8= afpd.8 atalkd.8 pap.8 papd.8 papstatus.8 psf.8 timelord.8
post-extract:
@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/netatalk.sh \
> ${WRKSRC}/netatalk.sh
@${RM} -f ${WRKSRC}/missing ${WRKSRC}/mkinstalldirs
post-configure:
@find ${WRKSRC} -type f | xargs ${TOUCH} -f
post-install:
@${RM} -f ${PREFIX}/bin/nu ${PREFIX}/bin/lp2pap.sh \

View File

@ -1 +1 @@
MD5 (netatalk-1.5pre8.tar.gz) = 5abc43625a4efa19ac4bf1a10bebab69
MD5 (netatalk-1.5rc1.tar.gz) = 66cba4ab02b37ea1fa1ff245e4669f2a

View File

@ -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)

View File

@ -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!])
)