Index: head/net/netatalk/Makefile =================================================================== --- head/net/netatalk/Makefile (revision 67337) +++ head/net/netatalk/Makefile (revision 67338) @@ -1,102 +1,102 @@ # Ports collection makefile for: netatalk # Date created: 23 Jul 1997 # Whom: stb # # $FreeBSD$ # PORTNAME= netatalk -PORTVERSION= 1.5.3.1 -PORTREVISION= 1 +PORTVERSION= 1.5.5 PORTEPOCH= 1 CATEGORIES= net print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= netatalk MAINTAINER= marcus@FreeBSD.org .if defined(WITH_CNID) LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3 .endif .if defined(WITH_SRVLOC) LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp .endif .if !exists(/usr/include/tcpd.h) LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper .endif USE_BZIP2= yes CONFIGURE_ARGS+= --with-tcp-wrappers \ --with-pkgconfdir=${PREFIX}/etc .if defined(WITH_PAM) CONFIGURE_ARGS+= --with-pam=/etc/pam.d PLIST_SUB+= NETATALKPAM="" .else CONFIGURE_ARGS+= --without-pam PLIST_SUB+= NETATALKPAM="@comment " .endif .if defined(WITH_SRVLOC) # Enable Service Location Protocol support. This allows MacOS X < 10.1 to # pickup afpd servers in the network. CONFIGURE_ARGS+= --enable-srvloc=${LOCALBASE} .endif .if defined(WITH_FLOCK_LOCKS) # Disable byte locking, and do full file locking. This _may_ help with some # Quark Express save issues. CONFIGURE_ARGS+= --with-flock-locks .endif .if defined(WITH_CNID) # 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.x and OS X. CONFIGURE_ARGS+= --with-did=cnid \ --with-db3=${LOCALBASE} PLIST_SUB+= NETATALKCNID="" .else # This method of DID calculation is not persistent, but has been tested to # work with MacOS X (10.0.3-10.1.3) as well as MacOS 7-9.2.2. CONFIGURE_ARGS+= --with-did=last PLIST_SUB+= NETATALKCNID="@comment " .endif GNU_CONFIGURE= yes +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} USE_GMAKE= yes USE_PERL5= yes FILES= AppleVolumes.default AppleVolumes.system afpd.conf \ atalkd.conf papd.conf LINKS= unbin unhex unsingle hqx2bin single2bin macbinary \ binheader nadheader MAN1= achfile.1 aecho.1 afile.1 afppasswd.1 getzones.1 \ megatron.1 nbp.1 pap.1 psorder.1 hqx2bin.1 macbinary.1 \ nbplkup.1 nbprgstr.1 nbpunrgstr.1 papstatus.1 \ single2bin.1 unbin.1 unhex.1 unsingle.1 acleandir.1 \ netatalk-config.1 timeout.1 apple_cp.1 apple_mv.1 \ apple_rm.1 MAN3= atalk_aton.3 nbp_name.3 MAN4= atalk.4 MAN5= AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \ netatalk.conf.5 papd.conf.5 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 post-install: @${RM} -f ${PREFIX}/bin/nu ${PREFIX}/bin/lp2pap.sh \ ${PREFIX}/bin/test_parse_mtab \ ${PREFIX}/bin/afpd-mtab.pl ${PREFIX}/etc/netatalk.conf.dist ${INSTALL_SCRIPT} ${WRKSRC}/netatalk.sh \ ${PREFIX}/etc/rc.d/netatalk.sh.sample ${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \ ${PREFIX}/bin/macusers .for i in ${FILES} [ -f ${PREFIX}/etc/${i} ] || \ ${INSTALL_DATA} -c ${PREFIX}/etc/${i}.dist ${PREFIX}/etc/${i} .endfor .for i in ${LINKS} ( cd ${PREFIX}/bin && ${LN} -sf megatron ${i} ) .endfor @${CAT} ${PKGMESSAGE} .include Property changes on: head/net/netatalk/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.43 \ No newline at end of property +1.44 \ No newline at end of property Index: head/net/netatalk/distinfo =================================================================== --- head/net/netatalk/distinfo (revision 67337) +++ head/net/netatalk/distinfo (revision 67338) @@ -1 +1 @@ -MD5 (netatalk-1.5.3.1.tar.bz2) = 7d9fe0fce60bccb1264fdbb42fa1465b +MD5 (netatalk-1.5.5.tar.bz2) = 93ec251d47f355c99daad19de0b40eb2 Property changes on: head/net/netatalk/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property Index: head/net/netatalk/files/patch-configure =================================================================== --- head/net/netatalk/files/patch-configure (revision 67337) +++ head/net/netatalk/files/patch-configure (revision 67338) @@ -1,29 +1,39 @@ ---- configure.orig Wed Mar 27 17:20:55 2002 -+++ configure Sun Mar 31 18:07:57 2002 -@@ -8483,14 +8483,14 @@ +--- configure.orig Sun Sep 1 12:50:59 2002 ++++ configure Wed Oct 2 22:19:05 2002 +@@ -1499,10 +1499,6 @@ + + # The aliases save the names the user supplied, while $host etc. + # will get canonicalized. +-test -n "$target_alias" && +- test "$program_prefix$program_suffix$program_transform_name" = \ +- NONENONEs,x,x, && +- program_prefix=${target_alias}- + am__api_version="1.6" + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -12706,13 +12702,13 @@ savedldflags="$LDFLAGS" CFLAGS="$CFLAGS -I$db3dir" LDFLAGS="-L$db3libdir $LDFLAGS" -- echo $ac_n "checking for main in -ldb""... $ac_c" 1>&6 --echo "configure:8488: checking for main in -ldb" >&5 -+ echo $ac_n "checking for main in -ldb3""... $ac_c" 1>&6 -+echo "configure:8488: checking for main in -ldb3" >&5 - ac_lib_var=`echo db'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +- echo "$as_me:$LINENO: checking for main in -ldb" >&5 +-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for main in -ldb3" >&5 ++echo $ECHO_N "checking for main in -ldb3... $ECHO_C" >&6 + if test "${ac_cv_lib_db_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS -LIBS="-ldb $LIBS" +LIBS="-ldb3 $LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" #include "confdefs.h" -@@ -8517,7 +8517,7 @@ - +@@ -12759,7 +12755,7 @@ + db3found=yes DB3_CFLAGS="-I$db3dir" - DB3_LIBS="-L$db3libdir -ldb" + DB3_LIBS="-L$db3libdir -ldb3" DB3_PATH="`echo $db3dir | sed 's,include/db3$,,'`" - - else + + fi Property changes on: head/net/netatalk/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/net/netatalk-devel/Makefile =================================================================== --- head/net/netatalk-devel/Makefile (revision 67337) +++ head/net/netatalk-devel/Makefile (revision 67338) @@ -1,102 +1,102 @@ # Ports collection makefile for: netatalk # Date created: 23 Jul 1997 # Whom: stb # # $FreeBSD$ # PORTNAME= netatalk -PORTVERSION= 1.5.3.1 -PORTREVISION= 1 +PORTVERSION= 1.5.5 PORTEPOCH= 1 CATEGORIES= net print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= netatalk MAINTAINER= marcus@FreeBSD.org .if defined(WITH_CNID) LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3 .endif .if defined(WITH_SRVLOC) LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp .endif .if !exists(/usr/include/tcpd.h) LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper .endif USE_BZIP2= yes CONFIGURE_ARGS+= --with-tcp-wrappers \ --with-pkgconfdir=${PREFIX}/etc .if defined(WITH_PAM) CONFIGURE_ARGS+= --with-pam=/etc/pam.d PLIST_SUB+= NETATALKPAM="" .else CONFIGURE_ARGS+= --without-pam PLIST_SUB+= NETATALKPAM="@comment " .endif .if defined(WITH_SRVLOC) # Enable Service Location Protocol support. This allows MacOS X < 10.1 to # pickup afpd servers in the network. CONFIGURE_ARGS+= --enable-srvloc=${LOCALBASE} .endif .if defined(WITH_FLOCK_LOCKS) # Disable byte locking, and do full file locking. This _may_ help with some # Quark Express save issues. CONFIGURE_ARGS+= --with-flock-locks .endif .if defined(WITH_CNID) # 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.x and OS X. CONFIGURE_ARGS+= --with-did=cnid \ --with-db3=${LOCALBASE} PLIST_SUB+= NETATALKCNID="" .else # This method of DID calculation is not persistent, but has been tested to # work with MacOS X (10.0.3-10.1.3) as well as MacOS 7-9.2.2. CONFIGURE_ARGS+= --with-did=last PLIST_SUB+= NETATALKCNID="@comment " .endif GNU_CONFIGURE= yes +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} USE_GMAKE= yes USE_PERL5= yes FILES= AppleVolumes.default AppleVolumes.system afpd.conf \ atalkd.conf papd.conf LINKS= unbin unhex unsingle hqx2bin single2bin macbinary \ binheader nadheader MAN1= achfile.1 aecho.1 afile.1 afppasswd.1 getzones.1 \ megatron.1 nbp.1 pap.1 psorder.1 hqx2bin.1 macbinary.1 \ nbplkup.1 nbprgstr.1 nbpunrgstr.1 papstatus.1 \ single2bin.1 unbin.1 unhex.1 unsingle.1 acleandir.1 \ netatalk-config.1 timeout.1 apple_cp.1 apple_mv.1 \ apple_rm.1 MAN3= atalk_aton.3 nbp_name.3 MAN4= atalk.4 MAN5= AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \ netatalk.conf.5 papd.conf.5 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 post-install: @${RM} -f ${PREFIX}/bin/nu ${PREFIX}/bin/lp2pap.sh \ ${PREFIX}/bin/test_parse_mtab \ ${PREFIX}/bin/afpd-mtab.pl ${PREFIX}/etc/netatalk.conf.dist ${INSTALL_SCRIPT} ${WRKSRC}/netatalk.sh \ ${PREFIX}/etc/rc.d/netatalk.sh.sample ${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \ ${PREFIX}/bin/macusers .for i in ${FILES} [ -f ${PREFIX}/etc/${i} ] || \ ${INSTALL_DATA} -c ${PREFIX}/etc/${i}.dist ${PREFIX}/etc/${i} .endfor .for i in ${LINKS} ( cd ${PREFIX}/bin && ${LN} -sf megatron ${i} ) .endfor @${CAT} ${PKGMESSAGE} .include Property changes on: head/net/netatalk-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.43 \ No newline at end of property +1.44 \ No newline at end of property Index: head/net/netatalk-devel/distinfo =================================================================== --- head/net/netatalk-devel/distinfo (revision 67337) +++ head/net/netatalk-devel/distinfo (revision 67338) @@ -1 +1 @@ -MD5 (netatalk-1.5.3.1.tar.bz2) = 7d9fe0fce60bccb1264fdbb42fa1465b +MD5 (netatalk-1.5.5.tar.bz2) = 93ec251d47f355c99daad19de0b40eb2 Property changes on: head/net/netatalk-devel/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property Index: head/net/netatalk-devel/files/patch-configure =================================================================== --- head/net/netatalk-devel/files/patch-configure (revision 67337) +++ head/net/netatalk-devel/files/patch-configure (revision 67338) @@ -1,29 +1,39 @@ ---- configure.orig Wed Mar 27 17:20:55 2002 -+++ configure Sun Mar 31 18:07:57 2002 -@@ -8483,14 +8483,14 @@ +--- configure.orig Sun Sep 1 12:50:59 2002 ++++ configure Wed Oct 2 22:19:05 2002 +@@ -1499,10 +1499,6 @@ + + # The aliases save the names the user supplied, while $host etc. + # will get canonicalized. +-test -n "$target_alias" && +- test "$program_prefix$program_suffix$program_transform_name" = \ +- NONENONEs,x,x, && +- program_prefix=${target_alias}- + am__api_version="1.6" + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -12706,13 +12702,13 @@ savedldflags="$LDFLAGS" CFLAGS="$CFLAGS -I$db3dir" LDFLAGS="-L$db3libdir $LDFLAGS" -- echo $ac_n "checking for main in -ldb""... $ac_c" 1>&6 --echo "configure:8488: checking for main in -ldb" >&5 -+ echo $ac_n "checking for main in -ldb3""... $ac_c" 1>&6 -+echo "configure:8488: checking for main in -ldb3" >&5 - ac_lib_var=`echo db'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +- echo "$as_me:$LINENO: checking for main in -ldb" >&5 +-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for main in -ldb3" >&5 ++echo $ECHO_N "checking for main in -ldb3... $ECHO_C" >&6 + if test "${ac_cv_lib_db_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS -LIBS="-ldb $LIBS" +LIBS="-ldb3 $LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" #include "confdefs.h" -@@ -8517,7 +8517,7 @@ - +@@ -12759,7 +12755,7 @@ + db3found=yes DB3_CFLAGS="-I$db3dir" - DB3_LIBS="-L$db3libdir -ldb" + DB3_LIBS="-L$db3libdir -ldb3" DB3_PATH="`echo $db3dir | sed 's,include/db3$,,'`" - - else + + fi Property changes on: head/net/netatalk-devel/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property