Index: head/net/netatalk-devel/Makefile =================================================================== --- head/net/netatalk-devel/Makefile (revision 112516) +++ head/net/netatalk-devel/Makefile (revision 112517) @@ -1,103 +1,102 @@ # Ports collection makefile for: netatalk # Date created: 23 Jul 1997 # Whom: stb # # $FreeBSD$ # PORTNAME= netatalk -PORTVERSION= 2.0.b1 -PORTREVISION= 1 +PORTVERSION= 2.0.b2 CATEGORIES= net print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= netatalk -DISTNAME= ${PORTNAME}-2.0-beta1 +DISTNAME= ${PORTNAME}-2.0-beta2 MAINTAINER= marcus@FreeBSD.org COMMENT= File and print server for AppleTalk networks LIB_DEPENDS= db41.1:${PORTSDIR}/databases/db41 .if defined(WITH_SRVLOC) LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp .endif NO_LATEST_LINK= yes USE_BZIP2= yes USE_ICONV= yes CONFIGURE_ARGS+= --with-tcp-wrappers \ --with-pkgconfdir=${PREFIX}/etc \ --with-libiconv=${LOCALBASE} .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 CONFIGURE_ARGS+= --with-bdb=${LOCALBASE} .if defined (WITH_TIMELORD) CONFIGURE_ARGS+= --enable-timelord PLIST_SUB+= TIMELORD="" .else PLIST_SUB+= TIMELORD="@comment " .endif GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-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 + apple_rm.1 uniconv.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 cnid_dbd.8 cnid_metad.8 papd.8 papstatus.8 \ psf.8 timelord.8 CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-1* pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "Netatalk has the following tunable options:" @${ECHO_MSG} " WITH_SRVLOC=yes Enable Service Location Protocol support" @${ECHO_MSG} " WITH_PAM=yes Enable PAM support" @${ECHO_MSG} " WITH_TIMELORD=yes Enable Timelord network time service" @${ECHO_MSG} "" @${ECHO_MSG} "See Netatalk's Makefile for more details on some of these options." @${ECHO_MSG} "" 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.57 \ No newline at end of property +1.58 \ No newline at end of property Index: head/net/netatalk-devel/distinfo =================================================================== --- head/net/netatalk-devel/distinfo (revision 112516) +++ head/net/netatalk-devel/distinfo (revision 112517) @@ -1,2 +1,2 @@ -MD5 (netatalk-2.0-beta1.tar.bz2) = 4f6ecf84cb11d5f99d0b1f9699f6c60d -SIZE (netatalk-2.0-beta1.tar.bz2) = 1212578 +MD5 (netatalk-2.0-beta2.tar.bz2) = 2ba71194848020987cfc9edf9ea2a31a +SIZE (netatalk-2.0-beta2.tar.bz2) = 1354226 Property changes on: head/net/netatalk-devel/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.19 \ No newline at end of property +1.20 \ No newline at end of property Index: head/net/netatalk-devel/files/patch-etc_afpd_quota.c =================================================================== --- head/net/netatalk-devel/files/patch-etc_afpd_quota.c (revision 112516) +++ head/net/netatalk-devel/files/patch-etc_afpd_quota.c (nonexistent) @@ -1,34 +0,0 @@ ---- etc/afpd/quota.c.orig Sat Jun 5 22:03:39 2004 -+++ etc/afpd/quota.c Sat Jun 5 22:05:20 2004 -@@ -57,6 +57,8 @@ - } - #endif /* NEED_QUOTACTL_WRAPPER */ - -+static int overquota( struct dqblk *); -+ - #ifdef linux - - #ifdef HAVE_LINUX_XQM_H -@@ -74,7 +76,6 @@ - - static int get_linux_xfs_quota(int, char*, uid_t, struct dqblk *); - static int get_linux_fs_quota(int, char*, uid_t, struct dqblk *); --static int overquota( struct dqblk *); - - /* format supported by current kernel */ - static int kernel_iface = IFACE_UNSET; -@@ -524,12 +525,12 @@ - if( - /* if overquota, free space is 0 otherwise hard-current */ - ( overquota( dq ) ? 0 : ( dq->dqb_bhardlimit ? dq->dqb_bhardlimit - -- dq->dqb_curblocks : ~((qsize_t) 0) ) ) -+ dq->dqb_curblocks : ~((u_int64_t) 0) ) ) - - > - - ( overquota( &dqg ) ? 0 : ( dqg.dqb_bhardlimit ? dqg.dqb_bhardlimit - -- dqg.dqb_curblocks : ~((qsize_t) 0) ) ) -+ dqg.dqb_curblocks : ~((u_int64_t) 0) ) ) - - ) /* if */ - { Property changes on: head/net/netatalk-devel/files/patch-etc_afpd_quota.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net/netatalk-devel/files/patch-etc_afpd_Makefile.in =================================================================== --- head/net/netatalk-devel/files/patch-etc_afpd_Makefile.in (revision 112516) +++ head/net/netatalk-devel/files/patch-etc_afpd_Makefile.in (nonexistent) @@ -1,20 +0,0 @@ ---- etc/afpd/Makefile.in.orig Sat Jun 19 18:36:07 2004 -+++ etc/afpd/Makefile.in Sat Jun 19 18:37:03 2004 -@@ -62,7 +62,7 @@ - CCDEPMODE = @CCDEPMODE@ - - CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \ -- @CFLAGS@ @SLP_CFLAGS@ \ -+ @CFLAGS@ @SLP_CFLAGS@ @ICONV_CFLAGS@ \ - -D_PATH_AFPDDEFVOL=\"$(pkgconfdir)/AppleVolumes.default\" \ - -D_PATH_AFPDSYSVOL=\"$(pkgconfdir)/AppleVolumes.system\" \ - -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \ -@@ -105,7 +105,7 @@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ - --LIBS = @LIBS@ @PAM_LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ -+LIBS = @LIBS@ @PAM_LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ @ICONV_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ Property changes on: head/net/netatalk-devel/files/patch-etc_afpd_Makefile.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net/netatalk-devel/files/patch-configure =================================================================== --- head/net/netatalk-devel/files/patch-configure (revision 112516) +++ head/net/netatalk-devel/files/patch-configure (revision 112517) @@ -1,52 +1,24 @@ ---- configure.orig Mon Mar 22 19:23:09 2004 -+++ configure Sat Jun 5 21:58:37 2004 -@@ -14156,7 +14156,7 @@ - +--- configure.orig Thu Jun 24 18:53:29 2004 ++++ configure Tue Jun 29 01:48:40 2004 +@@ -15048,7 +15048,7 @@ trybdbdir="" dobdbsearch=yes -- bdb_search_dirs="/usr/local/include/db4 /usr/local/include /usr/include/db4 /usr/include" -+ bdb_search_dirs="/usr/local/include/db41 /usr/local/include /usr/include/db4 /usr/include" + bdb_search_dirs="/usr/local/include /usr/include" +- search_subdirs="/db4.2 /db4.1 /db4 /" ++ search_subdirs="/db4.2 /db41 /db4 /" + DB_MAJOR_REQ=4 + DB_MINOR_REQ=1 +@@ -15178,10 +15178,10 @@ + if test ${atalk_cv_bdbheader} != "no"; then -@@ -14168,7 +14168,7 @@ - elif test "x$withval" = "xyes"; then - dobdbsearch=yes - else -- bdb_search_dirs="$withval/include/db4 $withval/include $withval" -+ bdb_search_dirs="$withval/include/db41 $withval/include $withval" - fi +- bdblibdir="`echo $bdbdir | sed 's/\/include\/db4\.*.*//'`" ++ bdblibdir="`echo $bdbdir | sed 's/\/include\/db4.*//'`" + bdblibdir="`echo $bdblibdir | sed 's/\/include$//'`" + bdblibdir="${bdblibdir}/${atalk_libname}" +- bdbbindir="`echo $bdbdir | sed 's/include\/db4\.*.*/bin/'`" ++ bdbbindir="`echo $bdbdir | sed 's/include\/db4.*/bin/'`" + bdbbindir="`echo $bdbbindir | sed 's/include$/bin/'`" - fi; -@@ -14181,9 +14181,9 @@ - if test -f "$bdbdir/db.h" ; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 -- bdblibdir="`echo $bdbdir | sed 's/include\/db4$/lib/'`" -+ bdblibdir="`echo $bdbdir | sed 's/include\/db41$/lib/'`" - bdblibdir="`echo $bdblibdir | sed 's/include$/lib/'`" -- bdbbindir="`echo $bdbdir | sed 's/include\/db4$/bin/'`" -+ bdbbindir="`echo $bdbdir | sed 's/include\/db41$/bin/'`" - bdbbindir="`echo $bdbbindir | sed 's/include$/bin/'`" - - savedcflags="$CFLAGS" -@@ -14196,8 +14196,8 @@ - - - bdbfound=yes -- LIBS="$LIBS -ldb" -- BDB_LIBS="-ldb" -+ LIBS="$LIBS -ldb41" -+ BDB_LIBS="-ldb41" - - - if test "x$bdbfound" = "xyes"; then -@@ -14448,7 +14448,7 @@ - BDB_LIBS="-L$bdblibdir $BDB_LIBS" - fi - BDB_BIN=$bdbbindir -- BDB_PATH="`echo $bdbdir | sed 's,include\/db4$,,'`" -+ BDB_PATH="`echo $bdbdir | sed 's,include\/db41$,,'`" - BDB_PATH="`echo $BDB_PATH | sed 's,include$,,'`" - fi - CFLAGS="$savedcflags" + CPPFLAGS="$CFLAGS -I${bdbdir}${subdir}" Property changes on: head/net/netatalk-devel/files/patch-configure ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/net/netatalk-devel/pkg-plist (revision 112516) +++ head/net/netatalk-devel/pkg-plist (revision 112517) @@ -1,143 +1,145 @@ bin/achfile bin/acleandir.rc bin/add_netatalk_printer bin/adv1tov2 bin/aecho bin/afile bin/afppasswd bin/apple_cp bin/apple_mv bin/apple_rm +bin/asip-status.pl bin/cleanappledouble.pl bin/cnid2_create bin/cnid_maint bin/getzones bin/macusers bin/megatron @unexec rm -f %B/unbin @unexec rm -f %B/unhex @unexec rm -f %B/unsingle @unexec rm -f %B/hqx2bin @unexec rm -f %B/single2bin @unexec rm -f %B/macbinary @unexec rm -f %B/binheader @unexec rm -f %B/nadheader @exec cd %B && ln -s megatron unbin @exec cd %B && ln -s megatron unhex @exec cd %B && ln -s megatron unsingle @exec cd %B && ln -s megatron hqx2bin @exec cd %B && ln -s megatron single2bin @exec cd %B && ln -s megatron macbinary @exec cd %B && ln -s megatron binheader @exec cd %B && ln -s megatron nadheader bin/nbplkup bin/nbprgstr bin/nbpunrgstr bin/netatalk-config bin/netatalkshorternamelinks.pl bin/pap bin/papstatus bin/psorder +bin/showppd bin/timeout bin/uniconv @unexec if cmp -s %D/etc/AppleVolumes.default %D/etc/AppleVolumes.default.dist; then rm -f %D/etc/AppleVolumes.default; fi etc/AppleVolumes.default.dist @exec [ ! -f %B/AppleVolumes.default ] && cp %B/%f %B/AppleVolumes.default @unexec if cmp -s %D/etc/AppleVolumes.system %D/etc/AppleVolumes.system.dist; then rm -f %D/etc/AppleVolumes.system; fi etc/AppleVolumes.system.dist @exec [ ! -f %B/AppleVolumes.system ] && cp %B/%f %B/AppleVolumes.system @unexec if cmp -s %D/etc/afpd.conf %D/etc/afpd.conf.dist; then rm -f %D/etc/afpd.conf; fi etc/afpd.conf.dist @exec [ ! -f %B/afpd.conf ] && cp %B/%f %B/afpd.conf @unexec if cmp -s %D/etc/atalkd.conf %D/etc/atalkd.conf.dist; then rm -f %D/etc/atalkd.conf; fi etc/atalkd.conf.dist @exec [ ! -f %B/atalkd.conf ] && cp %B/%f %B/atalkd.conf @unexec if cmp -s %D/etc/papd.conf %D/etc/papd.conf.dist; then rm -f %D/etc/papd.conf; fi etc/papd.conf.dist @exec [ ! -f %B/papd.conf ] && cp %B/%f %B/papd.conf etc/rc.d/netatalk.sh.sample etc/uams/uams_clrtxt.so etc/uams/uams_dhx.so %%NETATALKPAM%%etc/uams/uams_dhx_pam.so %%NETATALKPAM%%etc/uams/uams_dhx_pam.a etc/uams/uams_dhx_passwd.so etc/uams/uams_dhx_passwd.a etc/uams/uams_guest.so etc/uams/uams_guest.a %%NETATALKPAM%%etc/uams/uams_pam.so %%NETATALKPAM%%etc/uams/uams_pam.a etc/uams/uams_passwd.so etc/uams/uams_passwd.a etc/uams/uams_randnum.so etc/uams/uams_randnum.a include/atalk/adouble.h include/atalk/aep.h include/atalk/afp.h include/atalk/asp.h include/atalk/atp.h include/atalk/boolean.h include/atalk/cnid.h include/atalk/compat.h include/atalk/ddp.h include/atalk/dsi.h include/atalk/list.h include/atalk/logger.h include/atalk/nbp.h include/atalk/netddp.h include/atalk/pap.h include/atalk/paths.h include/atalk/rtmp.h include/atalk/server_child.h include/atalk/tdb.h include/atalk/uam.h include/atalk/util.h include/atalk/zip.h include/netatalk/aarp.c include/netatalk/aarp.h include/netatalk/at.h include/netatalk/at_control.c include/netatalk/at_proto.c include/netatalk/at_var.h include/netatalk/ddp.h include/netatalk/endian.h include/netatalk/ddp_var.h include/netatalk/ddp_input.c include/netatalk/ddp_output.c include/netatalk/ddp_usrreq.c include/netatalk/phase2.h lib/libatalk.a libexec/etc2ps.sh libexec/ifmpap libexec/ifmpaprev libexec/ifpap libexec/ifpaprev libexec/ifwmpap libexec/ifwmpaprev libexec/ifwpap libexec/ifwpaprev libexec/ofmpap libexec/ofpap libexec/ofwmpap libexec/ofwpap libexec/psa libexec/psf libexec/tfmpap libexec/tfmpaprev libexec/tfpap libexec/tfpaprev libexec/tfwmpap libexec/tfwmpaprev libexec/tfwpap libexec/tfwpaprev sbin/afpd sbin/atalkd sbin/cnid_dbd sbin/cnid_metad sbin/papd %%TIMELORD%%sbin/timelord share/aclocal/netatalk.m4 share/netatalk/pagecount.ps @dirrm share/netatalk @dirrm include/netatalk @dirrm include/atalk @dirrm etc/uams Property changes on: head/net/netatalk-devel/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.20 \ No newline at end of property +1.21 \ No newline at end of property