diff options
author | Norikatsu Shigemura <nork@FreeBSD.org> | 2003-02-28 12:05:30 +0000 |
---|---|---|
committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2003-02-28 12:05:30 +0000 |
commit | ee6e88c0494ae2684fbbeee97de93d02ea36ca9e (patch) | |
tree | f4348758ad1b68d9a6243186cef1c6bc1a652108 /japanese/samba | |
parent | Update to 2003.02.27. (diff) |
Fix build problem on 4.8-PRELEASE(reported in FreeBSD-users-jp@).
PR: ports/48698, FreeBSD-users-jp/73581
Reported by: K.Magara <magara@maizuru-ct.ac.jp>
Submitted by: NAKAJI Hiroyuki <nakaji@jp.freebsd.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=76631
Diffstat (limited to 'japanese/samba')
-rw-r--r-- | japanese/samba/Makefile | 1 | ||||
-rw-r--r-- | japanese/samba/files/patch-ah | 12 | ||||
-rw-r--r-- | japanese/samba/files/patch-ak | 20 | ||||
-rw-r--r-- | japanese/samba/files/patch-ba | 47 | ||||
-rw-r--r-- | japanese/samba/files/patch-includes.h | 13 |
5 files changed, 12 insertions, 81 deletions
diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile index 28b89ad3f522..c8478aeca8bc 100644 --- a/japanese/samba/Makefile +++ b/japanese/samba/Makefile @@ -7,6 +7,7 @@ PORTNAME= samba PORTVERSION= ${SAMBA_VERSION}.j${SAMBA_JA_VERSION} +PORTREVISION= 1 CATEGORIES= japanese net MASTER_SITES= ftp://ftp.samba.gr.jp/pub/samba-jp/%SUBDIR%/ \ ftp://ftp.iij.ad.jp/pub/SAMBA/samba-jp/%SUBDIR%/ \ diff --git a/japanese/samba/files/patch-ah b/japanese/samba/files/patch-ah deleted file mode 100644 index 1831962c70fa..000000000000 --- a/japanese/samba/files/patch-ah +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/util_sock.c.orig Tue Jun 11 18:48:41 2002 -+++ lib/util_sock.c Mon Jun 17 13:24:27 2002 -@@ -28,6 +28,9 @@ - extern int sslFd; - #endif /* WITH_SSL */ - -+#undef MSG_WAITALL -+#define MSG_WAITALL 0 -+ - /* the last IP received from */ - struct in_addr lastip; - diff --git a/japanese/samba/files/patch-ak b/japanese/samba/files/patch-ak deleted file mode 100644 index cf59571db545..000000000000 --- a/japanese/samba/files/patch-ak +++ /dev/null @@ -1,20 +0,0 @@ ---- script/installswat.sh.orig Thu Jan 31 16:56:23 2002 -+++ script/installswat.sh Wed Feb 20 15:36:18 2002 -@@ -10,7 +10,7 @@ - - for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do - if [ ! -d $d ]; then -- mkdir $d -+ mkdir -p $d - if [ ! -d $d ]; then - echo Failed to make directory $d, does $USER have privileges? - exit 1 -@@ -69,7 +69,7 @@ - - for d in $BOOKDIR $BOOKDIR/figs $BOOKDIR/gifs; do - if [ ! -d $d ]; then -- mkdir $d -+ mkdir -p $d - if [ ! -d $d ]; then - echo Failed to make directory $d, does $USER have privileges? - exit 1 diff --git a/japanese/samba/files/patch-ba b/japanese/samba/files/patch-ba index 283714abc761..b19b60f10b31 100644 --- a/japanese/samba/files/patch-ba +++ b/japanese/samba/files/patch-ba @@ -1,40 +1,15 @@ ---- configure.in.orig Mon Dec 16 12:00:04 2002 -+++ configure.in Mon Dec 16 22:56:30 2002 -@@ -510,9 +510,23 @@ - ############################################ - # we need dlopen/dlclose/dlsym/dlerror for PAM, the password database plugins and the new VFS code - AC_CHECK_FUNCS(dlopen) -+case "$host_os" in -+ *bsd*) -+ AC_CHECK_LIB(c, dlopen, [LIBS="$LIBS -lc"; -+ AC_DEFINE(HAVE_DLOPEN)]) -+ ;; -+esac - if test x"$ac_cv_func_dlopen" = x"no"; then -- AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl"; -- AC_DEFINE(HAVE_DLOPEN)]) -+ case "$host_os" in -+ *bsd*) -+ AC_CHECK_LIB(c, dlopen, [LIBS="$LIBS -lc"; -+ AC_DEFINE(HAVE_DLOPEN)]) -+ ;; -+ *) -+ AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl"; -+ AC_DEFINE(HAVE_DLOPEN)]) -+ ;; -+ esac - fi - # dlopen/dlclose/dlsym/dlerror will be checked again later and defines will be set then +--- configure.in.orig Wed Feb 26 17:32:32 2003 ++++ configure.in Wed Feb 26 17:33:13 2003 +@@ -170,7 +170,7 @@ + AC_SUBST(INSTALLCLIENTLIB) -@@ -972,6 +986,7 @@ - *osf*) AC_DEFINE(OSF1) - BLDSHARED="true" - LDSHFLAGS="-shared" -+ DYNEXP="-Wl,--export-dynamic" - SONAMEFLAG="-Wl,-soname," - PICFLAG="-fPIC" - AC_DEFINE(STAT_ST_BLOCKSIZE,512) -@@ -1981,7 +1996,7 @@ + # compile with optimization and without debugging by default +-CFLAGS="-O ${CFLAGS}" ++CFLAGS="${CFLAGS}" + + AC_ARG_ENABLE(debug, + [ --enable-debug Turn on compiler debugging information (default=no)], +@@ -1981,7 +1981,7 @@ yes) AC_MSG_RESULT(yes) AC_DEFINE(KRB5_AUTH) diff --git a/japanese/samba/files/patch-includes.h b/japanese/samba/files/patch-includes.h deleted file mode 100644 index 2d32256bcec3..000000000000 --- a/japanese/samba/files/patch-includes.h +++ /dev/null @@ -1,13 +0,0 @@ ---- include/includes.h.orig Tue Dec 10 19:50:18 2002 -+++ include/includes.h Tue Dec 10 19:52:33 2002 -@@ -808,8 +808,10 @@ - #endif - - /* this guess needs to be improved (tridge) */ -+#ifndef FREEBSD - #if (defined(STAT_STATVFS) || defined(STAT_STATVFS64)) && !defined(SYSV) - #define SYSV 1 -+#endif - #endif - - #ifndef DEFAULT_PRINTING |