>Number:         22823
>Category:       pkg
>Synopsis:       net/ns overrides owner/group
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Sep 17 00:04:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Min Sik Kim
>Release:        NetBSD 1.6ZA
>Organization:
>Environment:
System: NetBSD mike.infnis.com 1.6ZA NetBSD 1.6ZA (MIKE) #22: Sat Sep 13 12:13:07 CDT 2003 root@mike.infnis.com:/usr/src/sys/arch/i386/compile/MIKE i386
Architecture: i386
Machine: i386
>Description:
ns/net sets owner/group of installed files to be bin/bin, ignoring those
provided by $(INSTALL).
>How-To-Repeat:
make install in net/ns.
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/ns/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	2003/09/01 18:21:12	1.8
+++ Makefile	2003/09/16 23:45:18
@@ -2,6 +2,7 @@
 
 DISTNAME=	ns-src-2.26
 PKGNAME=	${DISTNAME:S/-src//}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/ns/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	2003/09/03 13:42:44	1.3
+++ distinfo	2003/09/16 23:45:18
@@ -2,7 +2,7 @@
 
 SHA1 (ns-src-2.26.tar.gz) = 23da69b5e23356a14e4e1825b7f434731bdc5f68
 Size (ns-src-2.26.tar.gz) = 41592248 bytes
-SHA1 (patch-aa) = 7acec0349ee60265655a633da659a12393b9fbc2
+SHA1 (patch-aa) = f9eae159453a3673feddc5e80c5bf2ff134b7d9c
 SHA1 (patch-ab) = 123d9110ac20063ffd32466dfa630bcbb76eff6d
 SHA1 (patch-ac) = 28cda4d9f68e031725016d2c06925394c76e5152
 SHA1 (patch-ad) = 43dbf7d17c22c300ab3e9ea7057b1cd8ff805958
@@ -12,8 +12,8 @@
 SHA1 (patch-ai) = b75f36f986ca7c833769de09e6e79f6b87c5564a
 SHA1 (patch-aj) = 533fa4f1bd1f8bf83882ed5ed2717511283d5ddc
 SHA1 (patch-ak) = ea478696cdddc44ba7a76d1f31d4a6a97a88aaef
-SHA1 (patch-al) = baf8543dfd598a52cb30502206b95b072a72a7c4
-SHA1 (patch-am) = d2f30afe70777f03486e606a076df95c52b18939
-SHA1 (patch-an) = 610ab5dd26a4f232af52662a373995378c12c58d
-SHA1 (patch-ao) = 2c319518185002b15d9b00d46d8257be9ff47984
-SHA1 (patch-ap) = 78e14fbc682f3fc87f3812773a9e12f17ec549a5
+SHA1 (patch-al) = 9ce53b51d15f51ab7d822e9cc75f42368690dd94
+SHA1 (patch-am) = 5901c5e880b58a84ea6dcbe5dfd442d8e4bb3fd1
+SHA1 (patch-an) = c5a672c47c554cd7a1970c732f1a9da76b6c7090
+SHA1 (patch-ao) = c21054375f00e4af77dd72b2bac2a734c64573e0
+SHA1 (patch-ap) = f59ca64a44c251104cd5cec173dbaad9c4e4756b
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/net/ns/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patches/patch-aa	2003/09/01 18:21:12	1.2
+++ patches/patch-aa	2003/09/16 23:45:18
@@ -11,3 +11,16 @@
  LDOUT	= -o $(BLANK)
  
  DEFINE	= -DTCP_DELAY_BIND_ALL -DNO_TK @V_DEFINE@ @V_DEFINES@ @DEFS@ -DNS_DIFFUSION -DSMAC_NO_SYNC -DSTL_NAMESPACE=@STL_NAMESPACE@ -DUSE_SINGLE_ADDRESS_SPACE
+@@ -452,10 +452,10 @@
+ install: force install-ns install-man install-recursive
+ 
+ install-ns: force
+-	$(INSTALL) -m 555 -o bin -g bin ns $(DESTDIR)$(BINDEST)
++	$(INSTALL) -m 555 ns $(DESTDIR)$(BINDEST)
+ 
+ install-man: force
+-	$(INSTALL) -m 444 -o bin -g bin ns.1 $(DESTDIR)$(MANDEST)/man1
++	$(INSTALL) -m 444 ns.1 $(DESTDIR)$(MANDEST)/man1
+ 
+ install-recursive: force
+ 	for i in $(SUBDIRS); do ( cd $$i; $(MAKE) install; ) done
Index: patches/patch-al
===================================================================
RCS file: /cvsroot/pkgsrc/net/ns/patches/patch-al,v
retrieving revision 1.3
diff -u -r1.3 patch-al
--- patches/patch-al	2003/09/03 13:42:45	1.3
+++ patches/patch-al	2003/09/16 23:45:18
@@ -2,7 +2,7 @@
 
 --- indep-utils/cmu-scen-gen/setdest/Makefile.in.orig	Fri Jan 11 22:06:09 2002
 +++ indep-utils/cmu-scen-gen/setdest/Makefile.in
-@@ -38,7 +38,7 @@ MKDEP	= ../../../conf/mkdep
+@@ -39,7 +39,7 @@ MKDEP	= ../../../conf/mkdep
  # when including files from ns, we need to take care STL_NAMESPACE
  DEFINE = -Dstand_alone -DSTL_NAMESPACE=@STL_NAMESPACE@
  CFLAGS = @V_CCOPT@ 
@@ -11,3 +11,14 @@
  LIBS = @V_LIB@ -lm @LIBS@
  INSTALL = @INSTALL@
  
+@@ -46,8 +46,8 @@
+ all: setdest calcdest
+ 
+ install: setdest calcdest
+-	$(INSTALL) -m 555 -o bin -g bin setdest $(DESTDIR)$(BINDEST)
++	$(INSTALL) -m 555 setdest $(DESTDIR)$(BINDEST)
+-	$(INSTALL) -m 555 -o bin -g bin calcdest $(DESTDIR)$(BINDEST)
++	$(INSTALL) -m 555 calcdest $(DESTDIR)$(BINDEST)
+ 
+ setdest: rng.o setdest.o
+ 	$(CCX) -o setdest $@.o rng.o $(DEFINE) $(LDFLAGS) $(CFLAGS) \
Index: patches/patch-am
===================================================================
RCS file: /cvsroot/pkgsrc/net/ns/patches/patch-am,v
retrieving revision 1.2
diff -u -r1.2 patch-am
--- patches/patch-am	2003/09/01 18:21:13	1.2
+++ patches/patch-am	2003/09/16 23:45:18
@@ -11,3 +11,12 @@
  LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
  INSTALL = @INSTALL@
  
+@@ -50,7 +50,7 @@
+ all: dec-tr-stat
+ 
+ install: dec-tr-stat
+-	$(INSTALL) -m 555 -o bin -g bin dec-tr-stat $(DESTDIR)$(BINDEST)
++	$(INSTALL) -m 555 dec-tr-stat $(DESTDIR)$(BINDEST)
+ 
+ dec-tr-stat: $(OBJ)
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJ) $(LIBS)
Index: patches/patch-an
===================================================================
RCS file: /cvsroot/pkgsrc/net/ns/patches/patch-an,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-an
--- patches/patch-an	2002/08/27 08:07:07	1.1.1.1
+++ patches/patch-an	2003/09/16 23:45:18
@@ -11,3 +11,12 @@
  LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
  INSTALL = @INSTALL@
  
+@@ -48,7 +48,7 @@
+ 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $(INCLUDE) $(OBJ) $(LIBS)
+ 
+ install: epa-tr-stat
+-	$(INSTALL) -m 555 -o bin -g bin epa-tr-stat $(DESTDIR)$(BINDEST)
++	$(INSTALL) -m 555 epa-tr-stat $(DESTDIR)$(BINDEST)
+ 
+ .SUFFIXES: .cc
+ 
Index: patches/patch-ao
===================================================================
RCS file: /cvsroot/pkgsrc/net/ns/patches/patch-ao,v
retrieving revision 1.2
diff -u -r1.2 patch-ao
--- patches/patch-ao	2003/09/01 18:21:13	1.2
+++ patches/patch-ao	2003/09/16 23:45:18
@@ -11,3 +11,12 @@
  LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
  INSTALL = @INSTALL@
  
+@@ -49,7 +49,7 @@
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJ) $(LIBS)
+ 
+ install: nlanr-tr-stat
+-	$(INSTALL) -m 555 -o bin -g bin nlanr-tr-stat $(DESTDIR)$(BINDEST)
++	$(INSTALL) -m 555 nlanr-tr-stat $(DESTDIR)$(BINDEST)
+ 
+ .SUFFIXES: .cc 
+ 
Index: patches/patch-ap
===================================================================
RCS file: /cvsroot/pkgsrc/net/ns/patches/patch-ap,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ap
--- patches/patch-ap	2002/08/27 08:07:07	1.1.1.1
+++ patches/patch-ap	2003/09/16 23:45:18
@@ -11,3 +11,12 @@
  LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
  INSTALL = @INSTALL@
  
+@@ -42,7 +42,7 @@
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJ) $(LIBS)
+ 
+ install: ucb-tr-stat
+-	$(INSTALL) -m 555 -o bin -g bin ucb-tr-stat $(DESTDIR)$(BINDEST)
++	$(INSTALL) -m 555 ucb-tr-stat $(DESTDIR)$(BINDEST)
+ 
+ .SUFFIXES: .cc
+ 

>Release-Note:
>Audit-Trail:
>Unformatted: