diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2000-08-29 19:47:14 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2000-08-29 19:47:14 +0000 |
| commit | 9bdf98646ee781dd51a2b264edaede6012b22cd2 (patch) | |
| tree | a37ca3ba38fd0531fe2d373f875e511479413cf2 /japanese/samba/files/patch-aa | |
| parent | Display help message about GNOME panel applet support. (diff) | |
Update to 2.0.7-ja-1.2a.
PR: ports/20802
Submitted by: NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
On PACKAGE_BUILDING, Generate PLIST which removes extras, namely
${PREFIX}/private/smbpasswd.
Found by: bento
Notes
Notes:
svn path=/head/; revision=32109
Diffstat (limited to 'japanese/samba/files/patch-aa')
| -rw-r--r-- | japanese/samba/files/patch-aa | 66 |
1 files changed, 47 insertions, 19 deletions
diff --git a/japanese/samba/files/patch-aa b/japanese/samba/files/patch-aa index 70e6ec50dbb2..3633f55c7b8f 100644 --- a/japanese/samba/files/patch-aa +++ b/japanese/samba/files/patch-aa @@ -1,19 +1,47 @@ -*** configure.in.orig Wed Jul 21 10:24:53 1999 ---- configure.in Mon Dec 27 04:46:26 1999 -*************** -*** 1064,1070 **** - --whithout-krb5 Don't include Kerbers 5 support (default)], - [ AC_MSG_RESULT(yes) - AC_DEFINE(KRB5_AUTH) -! LIBS="$LIBS -ldes425 -lkrb5 -lcrypto -lcom_err" - CFLAGS="$CFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib"], - AC_MSG_RESULT(no) ---- 1064,1070 ---- - --whithout-krb5 Don't include Kerbers 5 support (default)], - [ AC_MSG_RESULT(yes) - AC_DEFINE(KRB5_AUTH) -! LIBS="$LIBS -ldes425 -lkrb5 -lk5crypto -lcom_err" - CFLAGS="$CFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib"], - AC_MSG_RESULT(no) +--- Makefile.in.orig Wed Apr 26 02:06:11 2000 ++++ Makefile.in Thu Apr 27 11:08:08 2000 +@@ -25,7 +25,7 @@ + BINDIR = @bindir@ + # we don't use sbindir because we want full compatibility with + # the previous releases of Samba +-SBINDIR = @bindir@ ++SBINDIR = @sbindir@ + LIBDIR = @libdir@ + VARDIR = @localstatedir@ + MANDIR = @mandir@ +@@ -37,12 +37,13 @@ + # set these to where to find various files + # These can be overridden by command line switches (see smbd(8)) + # or in smb.conf (see smb.conf(5)) +-SMBLOGFILE = $(VARDIR)/log.smb +-NMBLOGFILE = $(VARDIR)/log.nmb ++LOGDIR=$(VARDIR)/log ++SMBLOGFILE = $(LOGDIR)/log.smb ++NMBLOGFILE = $(LOGDIR)/log.nmb + CONFIGFILE = $(LIBDIR)/smb.conf + LMHOSTSFILE = $(LIBDIR)/lmhosts + DRIVERFILE = $(LIBDIR)/printers.def +-PASSWD_PROGRAM = /bin/passwd ++PASSWD_PROGRAM = /usr/bin/passwd + # This is where smbpasswd et al go + PRIVATEDIR = @privatedir@ + +@@ -54,6 +55,9 @@ + # the directory where lock files go + LOCKDIR = @lockdir@ + ++# the directory where pid files go ++PIDFILEDIR = $(VARDIR)/run ++ + # The directory where code page definition files go + CODEPAGEDIR = $(LIBDIR)/codepages + +@@ -71,7 +75,7 @@ + PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" + FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\" + FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" +-FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" ++FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" + FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" + FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H + FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) |