svn commit: r324414 - in head/security/dsniff: . files

[Alexey Dokuchaev]

Author: danfe
Date: Fri Aug  9 02:11:20 2013
New Revision: 324414
URL: http://svnweb.freebsd.org/changeset/ports/324414

Log:
  - Unbreak parallel builds by fixing targets' dependencies
  - Cleanup port's Makefile slightly while I am here

Modified:
  head/security/dsniff/Makefile
  head/security/dsniff/files/patch-Makefile.in

Modified: head/security/dsniff/Makefile
==============================================================================
--- head/security/dsniff/Makefile	Fri Aug  9 01:49:55 2013	(r324413)
+++ head/security/dsniff/Makefile	Fri Aug  9 02:11:20 2013	(r324414)
@@ -1,4 +1,4 @@
-# Created by: kris at FreeBSD.org
+# Created by: Kris Kennaway <kris at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	dsniff
@@ -21,11 +21,8 @@ USES=		pkgconfig
 WANT_GNOME=	yes
 
 OPTIONS_DEFINE=	X11
-
 OPTIONS_DEFAULT=	X11
 
-.include <bsd.port.options.mk>
-
 MAN8=		arpspoof.8 ${PORTNAME}.8 macof.8 mailsnarf.8 tcpkill.8 \
 		tcpnice.8 urlsnarf.8 filesnarf.8 dnsspoof.8 msgsnarf.8 \
 		sshmitm.8 webmitm.8
@@ -38,7 +35,7 @@ LIBNET_INC=	"`${LIBNET_CONFIG} --defines
 LIBNET_LIB=	"-L${LOCALBASE}/include/libnet${LIBNET_VERSION} \
 		${LOCALBASE}/lib/libnet${LIBNET_VERSION}/libnet.a"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 # If net/libnids has been compiled with the GLIB2 option then this port needs
 # the corresponding library and additional linker flags.
@@ -74,4 +71,4 @@ pre-configure:
 		${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/dsniff/files/patch-Makefile.in
==============================================================================
--- head/security/dsniff/files/patch-Makefile.in	Fri Aug  9 01:49:55 2013	(r324413)
+++ head/security/dsniff/files/patch-Makefile.in	Fri Aug  9 02:11:20 2013	(r324414)
@@ -21,7 +21,7 @@
  
  INSTALL	= @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -76,7 +75,7 @@
+@@ -76,22 +75,23 @@
  .c.o:
  	$(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c
  
@@ -29,22 +29,33 @@
 +all: $(PROGS)
  
  mount.c: mount.x
- 	rpcgen -h mount.x -o mount.h
-@@ -86,13 +85,6 @@
- 	rpcgen -h nfs_prot.x -o nfs_prot.h
- 	rpcgen -c nfs_prot.x -o nfs_prot.c
+-	rpcgen -h mount.x -o mount.h
+-	rpcgen -c mount.x -o mount.c
++	rpcgen -c mount.x -o $@
++
++mount.h: mount.x
++	rpcgen -h mount.x -o $@
++
++decode_mountd.c: mount.h
+ 
+ nfs_prot.c: nfs_prot.x
+-	rpcgen -h nfs_prot.x -o nfs_prot.h
+-	rpcgen -c nfs_prot.x -o nfs_prot.c
++	rpcgen -c nfs_prot.x -o $@
  
 -$(LIBOBJS):
 -	$(CC) $(CFLAGS) $(INCS) -c $(srcdir)/missing/$*.c
--
++nfs_prot.h: nfs_prot.x
++	rpcgen -h nfs_prot.x -o $@
+ 
 -libmissing.a: $(LIBOBJS)
 -	ar -cr $@ $(LIBOBJS)
 -	$(RANLIB) $@
--
++filesnarf.c: nfs_prot.h
+ 
  dsniff: $(HDRS) $(SRCS) $(OBJS)
  	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
- 
-@@ -153,7 +145,7 @@
+@@ -153,7 +153,7 @@
  	done
  
  clean: