Attachment #48142 for bug #73701

View | Details | Raw Unified | Return to bug 73701
Collapse All | Expand All

Lines 6-12 Link Here

(-)Makefile (-17 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= samba	8	PORTNAME= samba
9	PORTVERSION= 3.0.7	9	PORTVERSION= 3.0.8
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	PORTEPOCH?= 1	11	PORTEPOCH?= 1
12	CATEGORIES?= net	12	CATEGORIES?= net
Lines 14-25 Link Here
14	MASTER_SITE_SUBDIR= . old-versions rc pre	14	MASTER_SITE_SUBDIR= . old-versions rc pre
15	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}	15	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
16		16
17	.if defined(WITH_MULTIBYTE)
18	PATCH_SITES= http://dist.bsdlab.org/
19	PATCHFILES= samba-3.0.7-i18n-20040915.bz2
20	PATCH_DIST_STRIP= -p0
21	.endif
22
23	MAINTAINER?= timur@gnu.org	17	MAINTAINER?= timur@gnu.org
24	COMMENT?= A free SMB and CIFS client and server for UNIX	18	COMMENT?= A free SMB and CIFS client and server for UNIX
25		19
Lines 48-53 Link Here
48	CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \	42	CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \
49	LDFLAGS=-L${LOCALBASE}/lib	43	LDFLAGS=-L${LOCALBASE}/lib
50		44
		45	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
		46
51	CONFIGURE_ARGS+= --exec-prefix=${PREFIX} \	47	CONFIGURE_ARGS+= --exec-prefix=${PREFIX} \
52	--localstatedir=${VARDIR} \	48	--localstatedir=${VARDIR} \
53	--with-configdir=${SAMBA_CONFDIR} \	49	--with-configdir=${SAMBA_CONFDIR} \
Lines 76-83 Link Here
76	SAM_PGSQL "With PostgreSQL smbpasswd backend" off \	72	SAM_PGSQL "With PostgreSQL smbpasswd backend" off \
77	SAM_OLD_LDAP "With Samba2.x LDAP smbpasswd backend" off \	73	SAM_OLD_LDAP "With Samba2.x LDAP smbpasswd backend" off \
78	PAM_SMBPASS "With SMB PAM module" off \	74	PAM_SMBPASS "With SMB PAM module" off \
79	POPT "With installed POPT library" on \	75	POPT "With installed POPT library" on
80	MULTIBYTE "With multibyte encoding patch" off
81	.endif	76	.endif
82		77
83	.include <bsd.port.pre.mk>	78	.include <bsd.port.pre.mk>
Lines 254-267 Link Here
254	WINBIND_FILTER= ${GREP} -v '^%%WINBIND%%'	249	WINBIND_FILTER= ${GREP} -v '^%%WINBIND%%'
255	.endif	250	.endif
256		251
257	.if defined(WITH_MULTIBYTE)
258	# Based on patch from miraclelinux.com.
259	# http://www.miraclelinux.com/english/technet/samba30/index.html
260	PLIST_SUB+= MULTIBYTE=""
261	.else
262	PLIST_SUB+= MULTIBYTE="@comment "
263	.endif
264
265	PLIST_SUB+= RC_DIR=${RC_DIR} \	252	PLIST_SUB+= RC_DIR=${RC_DIR} \
266	SAMBA_LOGDIR=${SAMBA_LOGDIR} \	253	SAMBA_LOGDIR=${SAMBA_LOGDIR} \
267	SAMBA_LOCKDIR=${SAMBA_LOCKDIR}	254	SAMBA_LOCKDIR=${SAMBA_LOCKDIR}

Lines 1-4 Link Here

(-)distinfo (-4 / +2 lines)
1	MD5 (samba-3.0.7.tar.gz) = 5906341429e64214909865a4be92e4ab	1	MD5 (samba-3.0.8.tar.gz) = 7088483c858ac362d302acc0c2a1d431
2	SIZE (samba-3.0.7.tar.gz) = 15012667	2	SIZE (samba-3.0.8.tar.gz) = 15101353
3	MD5 (samba-3.0.7-i18n-20040915.bz2) = f19a3cb34179632563c51c6cf54d3d3d
4	SIZE (samba-3.0.7-i18n-20040915.bz2) = 17160

Lines 17-22 Link Here

(-)pkg-plist (-6 / +4 lines)
17	bin/smbtree	17	bin/smbtree
18	bin/tdbbackup	18	bin/tdbbackup
19	bin/tdbdump	19	bin/tdbdump
		20	bin/tdbtool
20	bin/testparm	21	bin/testparm
21	bin/testprns	22	bin/testprns
22	%%WINBIND%%bin/wbinfo	23	%%WINBIND%%bin/wbinfo
Lines 44-50 Link Here
44	lib/samba/vfs/default_quota.so	45	lib/samba/vfs/default_quota.so
45	lib/samba/vfs/expand_msdfs.so	46	lib/samba/vfs/expand_msdfs.so
46	lib/samba/vfs/extd_audit.so	47	lib/samba/vfs/extd_audit.so
47	%%MULTIBYTE%%lib/samba/vfs/hex.so
48	lib/samba/vfs/fake_perms.so	48	lib/samba/vfs/fake_perms.so
49	lib/samba/vfs/full_audit.so	49	lib/samba/vfs/full_audit.so
50	lib/samba/vfs/netatalk.so	50	lib/samba/vfs/netatalk.so
Lines 127-132 Link Here
127	%%EXAMPLESDIR%%/VFS/skel_transparent.c	127	%%EXAMPLESDIR%%/VFS/skel_transparent.c
128	%%EXAMPLESDIR%%/auth/Makefile	128	%%EXAMPLESDIR%%/auth/Makefile
129	%%EXAMPLESDIR%%/auth/auth_skel.c	129	%%EXAMPLESDIR%%/auth/auth_skel.c
		130	%%EXAMPLESDIR%%/auth/crackcheck/Makefile
		131	%%EXAMPLESDIR%%/auth/crackcheck/crackcheck.c
130	%%EXAMPLESDIR%%/autofs/auto.smb	132	%%EXAMPLESDIR%%/autofs/auto.smb
131	%%EXAMPLESDIR%%/dce-dfs/README	133	%%EXAMPLESDIR%%/dce-dfs/README
132	%%EXAMPLESDIR%%/dce-dfs/smb.conf	134	%%EXAMPLESDIR%%/dce-dfs/smb.conf
Lines 191-196 Link Here
191	@dirrm %%EXAMPLESDIR%%/genlogon	193	@dirrm %%EXAMPLESDIR%%/genlogon
192	@dirrm %%EXAMPLESDIR%%/dce-dfs	194	@dirrm %%EXAMPLESDIR%%/dce-dfs
193	@dirrm %%EXAMPLESDIR%%/autofs	195	@dirrm %%EXAMPLESDIR%%/autofs
		196	@dirrm %%EXAMPLESDIR%%/auth/crackcheck
194	@dirrm %%EXAMPLESDIR%%/auth	197	@dirrm %%EXAMPLESDIR%%/auth
195	@dirrm %%EXAMPLESDIR%%/VFS	198	@dirrm %%EXAMPLESDIR%%/VFS
196	@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd	199	@dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd
Lines 472-481 Link Here
472	share/swat/include/footer.html	475	share/swat/include/footer.html
473	share/swat/include/header.html	476	share/swat/include/header.html
474	share/swat/lang/ja/help/welcome.html	477	share/swat/lang/ja/help/welcome.html
475	share/swat/lang/ja/include/footer.html
476	share/swat/lang/ja/include/header.html
477	share/swat/lang/ja/include/header.nocss.html
478	share/swat/lang/ja/include/header_css.html
479	share/swat/lang/tr/help/welcome.html	478	share/swat/lang/tr/help/welcome.html
480	share/swat/lang/tr/images/globals.gif	479	share/swat/lang/tr/images/globals.gif
481	share/swat/lang/tr/images/home.gif	480	share/swat/lang/tr/images/home.gif
Lines 485-491 Link Here
485	share/swat/lang/tr/images/shares.gif	484	share/swat/lang/tr/images/shares.gif
486	share/swat/lang/tr/images/status.gif	485	share/swat/lang/tr/images/status.gif
487	share/swat/lang/tr/images/viewconfig.gif	486	share/swat/lang/tr/images/viewconfig.gif
488	share/swat/lang/tr/include/header.html
489	share/swat/using_samba/appa.html	487	share/swat/using_samba/appa.html
490	share/swat/using_samba/appb.html	488	share/swat/using_samba/appb.html
491	share/swat/using_samba/appc.html	489	share/swat/using_samba/appc.html




--- Makefile.in.orig	Sun Nov  7 21:43:23 2004
+++ Makefile.in	Mon Nov  8 17:40:48 2004
@@ -99,6 +99,7 @@
 LIBSMBCLIENT_MAJOR=0
 LIBSMBCLIENT_MINOR=1
 

 
 FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. $(CPPFLAGS) -I$(srcdir)
 FLAGS2 = 
@@ -989,8 +990,8 @@
 		@SONAMEFLAG@`basename $@`
 
 bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
-	@echo Linking libsmbclient shared library $@
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
+	@echo Linking libsmbclient shared library $@.$(LIBSMBCLIENT_MAJOR)
+	@$(SHLD) $(LDSHFLAGS) -o $@.$(LIBSMBCLIENT_MAJOR) $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
 		$(KRB5LIBS) $(LDAP_LIBS) \
 		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
 
@@ -1074,13 +1075,13 @@
 @WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
 	@echo "Linking $@"
 	@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \

 
 nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
 	@echo "Linking $@"
@@ -1276,7 +1277,7 @@
 
 bin/t_snprintf@EXEEXT@: lib/snprintf.c
 	$(CC) $(FLAGS) -o $@ $(DYNEXP) -DTEST_SNPRINTF lib/snprintf.c -lm
-install: installbin installman installscripts installdat installswat installmodules @INSTALLCLIENT@
+install: installbin installscripts installdat installswat installmodules

Return to bug 73701

Lines 1-6 Link Here

(-)files/patch-Makefile.in (-9 / +9 lines)
1	--- Makefile.in.orig Thu Aug 19 15:39:11 2004	1	--- Makefile.in.orig Sun Nov 7 21:43:23 2004
2	+++ Makefile.in Mon Aug 30 22:02:08 2004	2	+++ Makefile.in Mon Nov 8 17:40:48 2004
3	@@ -104,6 +104,7 @@	3	@@ -99,6 +99,7 @@
4	LIBSMBCLIENT_MAJOR=0	4	LIBSMBCLIENT_MAJOR=0
5	LIBSMBCLIENT_MINOR=1	5	LIBSMBCLIENT_MINOR=1
6		6
Lines 8-25 Link Here
8		8
9	FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper -I. $(CPPFLAGS) -I$(srcdir)	9	FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper -I. $(CPPFLAGS) -I$(srcdir)
10	FLAGS2 =	10	FLAGS2 =
11	@@ -992,8 +993,8 @@	11	@@ -989,8 +990,8 @@
12	@SONAMEFLAG@`basename $@`	12	@SONAMEFLAG@`basename $@`
13		13
14	bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)	14	bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
15	- @echo Linking libsmbclient shared library $@	15	- @echo Linking libsmbclient shared library $@
16	- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(DYNEXP) $(LIBS) \	16	- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
17	+ @echo Linking libsmbclient shared library $@.$(LIBSMBCLIENT_MAJOR)	17	+ @echo Linking libsmbclient shared library $@.$(LIBSMBCLIENT_MAJOR)
18	+ @$(SHLD) $(LDSHFLAGS) -o $@.$(LIBSMBCLIENT_MAJOR) $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(DYNEXP) $(LIBS) \	18	+ @$(SHLD) $(LDSHFLAGS) -o $@.$(LIBSMBCLIENT_MAJOR) $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
19	$(KRB5LIBS) $(LDAP_LIBS) \	19	$(KRB5LIBS) $(LDAP_LIBS) \
20	@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)	20	@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
21		21
22	@@ -1076,13 +1077,13 @@	22	@@ -1074,13 +1075,13 @@
23	@WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)	23	@WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
24	@echo "Linking $@"	24	@echo "Linking $@"
25	@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \	25	@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
Lines 35-44 Link Here
35		35
36	nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy	36	nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
37	@echo "Linking $@"	37	@echo "Linking $@"
38	@@ -1268,7 +1269,7 @@	38	@@ -1276,7 +1277,7 @@
39		39
40	bin/t_snprintf@EXEEXT@: lib/snprintf.c	40	bin/t_snprintf@EXEEXT@: lib/snprintf.c
41	$(CC) $(FLAGS) -o $@ -DTEST_SNPRINTF lib/snprintf.c -lm	41	$(CC) $(FLAGS) -o $@ $(DYNEXP) -DTEST_SNPRINTF lib/snprintf.c -lm
42	-install: installbin installman installscripts installdat installswat installmodules @INSTALLCLIENT@	42	-install: installbin installman installscripts installdat installswat installmodules @INSTALLCLIENT@
43	+install: installbin installscripts installdat installswat installmodules	43	+install: installbin installscripts installdat installswat installmodules