mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-14 07:43:06 +00:00
Code Issues Releases Activity

Update to 2.0 Beta 2.

Browse Source
This commit is contained in:
Joe Marcus Clarke 2004-06-29 05:56:32 +00:00
parent 2240eae5af
commit 65cd06ae81
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=112517
6 changed files with 25 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/netatalk-devel/Makefile
View File

@ -6,12 +6,11 @@
#
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
@ -59,7 +58,7 @@ MAN1= achfile.1 aecho.1 afile.1 afppasswd.1 getzones.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 \

4
net/netatalk-devel/distinfo
View File

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

64
net/netatalk-devel/files/patch-configure
View File

@ -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}"

20
net/netatalk-devel/files/patch-etc_afpd_Makefile.in
View File

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

34
net/netatalk-devel/files/patch-etc_afpd_quota.c
View File

@ -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 */
{

2
net/netatalk-devel/pkg-plist
View File

@ -8,6 +8,7 @@ bin/afppasswd
bin/apple_cp
bin/apple_mv
bin/apple_rm
bin/asip-status.pl
bin/cleanappledouble.pl
bin/cnid2_create
bin/cnid_maint
@ -38,6 +39,7 @@ 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