svn commit: r324017 - in head/security/ADMsmb: . files

[Alexey Dokuchaev]

Author: danfe
Date: Wed Jul 31 08:33:56 2013
New Revision: 324017
URL: http://svnweb.freebsd.org/changeset/ports/324017

Log:
  - Unbreak parallel (-jX) builds (have to use GNU make)
  - Respect CC and CFLAGS in a less intrusive way
  - Minor cleanups; remove dead WWW link from pkg-descr

Modified:
  head/security/ADMsmb/Makefile
  head/security/ADMsmb/files/patch-Makefile
  head/security/ADMsmb/pkg-descr

Modified: head/security/ADMsmb/Makefile
==============================================================================
--- head/security/ADMsmb/Makefile	Wed Jul 31 08:13:51 2013	(r324016)
+++ head/security/ADMsmb/Makefile	Wed Jul 31 08:33:56 2013	(r324017)
@@ -1,4 +1,4 @@
-# Created by: tutus at trynet.eu.org
+# Created by: Jacek Serwatynski <tutus at trynet.eu.org>
 # $FreeBSD$
 
 PORTNAME=	ADMsmb
@@ -11,7 +11,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Security scanner for Samba
 
-MAKE_JOBS_UNSAFE=	yes
+USES=		gmake
+MAKE_ARGS=	CC="${CC}" FLAGS1="${CFLAGS}"
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.o" -delete
@@ -19,7 +20,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ADMsmb ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/ADMsmb
+	@${MKDIR} ${PREFIX}/share/ADMsmb
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/ADMsmb
 
 .include <bsd.port.mk>

Modified: head/security/ADMsmb/files/patch-Makefile
==============================================================================
--- head/security/ADMsmb/files/patch-Makefile	Wed Jul 31 08:13:51 2013	(r324016)
+++ head/security/ADMsmb/files/patch-Makefile	Wed Jul 31 08:33:56 2013	(r324017)
@@ -1,20 +1,10 @@
 --- Makefile.orig	Tue Oct  3 19:42:32 2006
 +++ Makefile	Tue Oct  3 19:43:32 2006
-@@ -11,7 +11,7 @@
- FLAGS1 = -O2 -fno-strict-aliasing -pipe -march=pentium -static
- LIBS1 = 
+@@ -108,6 +108,7 @@
+ 	@$(SHELL) $(srcdir)checkos.sh $(FLAGSM)
+ 	@echo "Using CFLAGS = $(CFLAGS)"
+ 	@echo "Using LIBS = $(LIBS)"
++	@echo "Using CC = $(CC)"
  
--CC = gcc
-+#CC = gcc
- 
- # This may help with some versions of make
- SHELL = /bin/sh
-@@ -56,7 +56,7 @@
- CFLAGS3 = -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
- CFLAGS4 = -DWORKGROUP=\"$(WORKGROUP)\" -DGUEST_ACCOUNT=\"$(GUESTACCOUNT)\" -DDRIVERFILE=\"$(DRIVERFILE)\"
- CFLAGS5 = $(CFLAGS1) $(CFLAGS2) $(CFLAGS3) $(CFLAGS4) $(FLAGSM) $(AFS_FLAGS) $(KRB5_FLAGS) $(KRB4_FLAGS) $(RPM_OPT_FLAGS)
--CFLAGS  = $(CFLAGS5) $(PAM_FLAGS) $(DCE_FLAGS) $(DES_FLAGS) $(PASSWD_FLAGS) $(VTP_FLAGS)
-+CFLAGS += $(CFLAGS5) $(PAM_FLAGS) $(DCE_FLAGS) $(DES_FLAGS) $(PASSWD_FLAGS) $(VTP_FLAGS)
- LIBS = $(LIBS1) $(LIBSM) $(PAM_LIBS) $(DCE_LIBS) $(KRB5_LIBS) $(KRB4_LIBS) $(DES_LIB)
- 
- INCLUDES1 = $(srcdir)version.h $(srcdir)local.h $(srcdir)includes.h $(srcdir)smb.h 
+ .SUFFIXES:
+ .SUFFIXES: .c .o .h

Modified: head/security/ADMsmb/pkg-descr
==============================================================================
--- head/security/ADMsmb/pkg-descr	Wed Jul 31 08:13:51 2013	(r324016)
+++ head/security/ADMsmb/pkg-descr	Wed Jul 31 08:33:56 2013	(r324017)
@@ -2,5 +2,3 @@ ADM smb is a security scanner for Samba
 /* based on the src of the smbclient  from the samba team */
 ADMsmb will perform a complete audit of samba for you on a host you
 provide.
-
-WWW: http://adm.freelsd.net/ADM