|  | @@ -3,24 +3,24 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  include ${ADK_TOPDIR}/rules.mk
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -PKG_NAME:=		samba
 | 
	
		
			
				|  |  | +PKG_NAME:=		samba3
 | 
	
		
			
				|  |  |  PKG_VERSION:=		3.6.25
 | 
	
		
			
				|  |  |  PKG_RELEASE:=		1
 | 
	
		
			
				|  |  |  PKG_HASH:=		8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751
 | 
	
		
			
				|  |  | -PKG_DESCR:=		smb file and print server
 | 
	
		
			
				|  |  | +PKG_DESCR:=		file and print server (version 3)
 | 
	
		
			
				|  |  |  PKG_SECTION:=		net/fs
 | 
	
		
			
				|  |  |  PKG_BUILDDEP:=		gettext-tiny util-linux popt
 | 
	
		
			
				|  |  | -PKG_DEPENDS:=		samba-lib libuuid libpopt
 | 
	
		
			
				|  |  | +PKG_DEPENDS:=		libuuid libpopt
 | 
	
		
			
				|  |  |  PKG_URL:=		http://www.samba.org/
 | 
	
		
			
				|  |  |  PKG_SITES:=		http://samba.org/samba/ftp/stable/
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 | 
	
		
			
				|  |  | +DISTFILES:=		${PKG_NAME}3-${PKG_VERSION}.tar.gz
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  WRKSRC=			${WRKDIST}/source3
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  include ${ADK_TOPDIR}/mk/package.mk
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -$(eval $(call PKG_template,SAMBA,samba,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 | 
	
		
			
				|  |  | +$(eval $(call PKG_template,SAMBA3,samba3,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  CONFIGURE_ENV+=		samba_cv_CC_NEGATIVE_ENUM_VALUES=no \
 | 
	
		
			
				|  |  |  			samba_cv_USE_SETRESUID=yes \
 | 
	
	
		
			
				|  | @@ -50,24 +50,24 @@ CONFIGURE_ARGS+=	--libdir=/usr/lib \
 | 
	
		
			
				|  |  |  			--without-winbind \
 | 
	
		
			
				|  |  |  			--with-ldap=no
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -samba-install:
 | 
	
		
			
				|  |  | -	${INSTALL_DIR} ${IDIR_SAMBA}/etc/samba 
 | 
	
		
			
				|  |  | -	${INSTALL_DIR} ${IDIR_SAMBA}/usr/sbin
 | 
	
		
			
				|  |  | -	${INSTALL_DIR} ${IDIR_SAMBA}/usr/bin
 | 
	
		
			
				|  |  | -	${INSTALL_DIR} ${IDIR_SAMBA}/usr/lib/{charset,vfs}
 | 
	
		
			
				|  |  | +samba3-install:
 | 
	
		
			
				|  |  | +	${INSTALL_DIR} ${IDIR_SAMBA3}/etc/samba 
 | 
	
		
			
				|  |  | +	${INSTALL_DIR} ${IDIR_SAMBA3}/usr/sbin
 | 
	
		
			
				|  |  | +	${INSTALL_DIR} ${IDIR_SAMBA3}/usr/bin
 | 
	
		
			
				|  |  | +	${INSTALL_DIR} ${IDIR_SAMBA3}/usr/lib/{charset,vfs}
 | 
	
		
			
				|  |  |  	${INSTALL_DATA} ${WRKINST}/usr/lib/charset/*.so \
 | 
	
		
			
				|  |  | -			${IDIR_SAMBA}/usr/lib/charset
 | 
	
		
			
				|  |  | -	${INSTALL_DATA} ./files/smb.conf ${IDIR_SAMBA}/etc/samba
 | 
	
		
			
				|  |  | -	${INSTALL_BIN} ${WRKINST}/usr/sbin/{nmbd,smbd} ${IDIR_SAMBA}/usr/sbin
 | 
	
		
			
				|  |  | -	${CP} ${WRKINST}/usr/lib/vfs/*.so* ${IDIR_SAMBA}/usr/lib/vfs
 | 
	
		
			
				|  |  | -	${INSTALL_DATA} ${WRKINST}/usr/lib/*.dat ${IDIR_SAMBA}/usr/lib
 | 
	
		
			
				|  |  | +			${IDIR_SAMBA3}/usr/lib/charset
 | 
	
		
			
				|  |  | +	${INSTALL_DATA} ./files/smb.conf ${IDIR_SAMBA3}/etc/samba
 | 
	
		
			
				|  |  | +	${INSTALL_BIN} ${WRKINST}/usr/sbin/{nmbd,smbd} ${IDIR_SAMBA3}/usr/sbin
 | 
	
		
			
				|  |  | +	${CP} ${WRKINST}/usr/lib/vfs/*.so* ${IDIR_SAMBA3}/usr/lib/vfs
 | 
	
		
			
				|  |  | +	${INSTALL_DATA} ${WRKINST}/usr/lib/*.dat ${IDIR_SAMBA3}/usr/lib
 | 
	
		
			
				|  |  |  	${INSTALL_BIN} ${WRKINST}/usr/bin/smbpasswd \
 | 
	
		
			
				|  |  | -		${IDIR_SAMBA}/usr/bin
 | 
	
		
			
				|  |  | +		${IDIR_SAMBA3}/usr/bin
 | 
	
		
			
				|  |  |  	${INSTALL_BIN} ${WRKINST}/usr/bin/smbclient \
 | 
	
		
			
				|  |  | -		${IDIR_SAMBA}/usr/bin
 | 
	
		
			
				|  |  | +		${IDIR_SAMBA3}/usr/bin
 | 
	
		
			
				|  |  |  	${CP} ${WRKINST}/usr/lib/{libsmbclient,libsmbsharemodes,libnetapi}.so* \
 | 
	
		
			
				|  |  | -		${IDIR_SAMBA}/usr/lib
 | 
	
		
			
				|  |  | +		${IDIR_SAMBA3}/usr/lib
 | 
	
		
			
				|  |  |  	$(CP) ${WRKINST}/usr/lib/{libtalloc,libtdb,libtevent}.so* \
 | 
	
		
			
				|  |  | -		${IDIR_SAMBA}/usr/lib
 | 
	
		
			
				|  |  | +		${IDIR_SAMBA3}/usr/lib
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  include ${ADK_TOPDIR}/mk/pkg-bottom.mk
 |