Don't install stuff group-writable when it doesnt need to be.

Reviewed by:	fenner (maintainer)

6 files changed, 89 insertions, 9 deletions

diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index a358e617a7d7..e992f90294d6 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -79,6 +79,7 @@ post-install:
 	${CP} -pr ${WRKSRC}/${i} ${PREFIX}/share/geomview
 	${CHOWN} -R ${SHAREOWN}.${SHAREGRP} ${PREFIX}/share/geomview/${i}
 .endfor
+	${CHMOD} -R g-w ${WRKSRC}/modules
 .for i in ${SHARE_MODS}
 	${RM} -rf ${PREFIX}/share/geomview/modules/${i}
 	${MKDIR} ${PREFIX}/share/geomview/modules/${i}
diff --git a/graphics/geomview/files/patch-ae b/graphics/geomview/files/patch-ae
index 080f4754ae1d..648705684399 100644
--- a/graphics/geomview/files/patch-ae
+++ b/graphics/geomview/files/patch-ae
@@ -1,17 +1,32 @@
---- src/bin/geomview/x11/Makefile.orig	Mon Nov  4 12:10:47 1996
-+++ src/bin/geomview/x11/Makefile	Sun Dec 15 10:34:47 1996
-@@ -25,9 +25,12 @@
- 		-e 's/^MACHTYPE=.*/MACHTYPE=${MACHTYPE}/' < geomview-x11 > $@
- 	chmod +x $@
+--- ./src/bin/geomview/x11/Makefile.orig	Sat Mar 14 00:42:39 1998
++++ ./src/bin/geomview/x11/Makefile	Tue Aug 15 03:41:13 2000
+@@ -24,9 +24,9 @@
+ install:	all install_script install_others
+ 
+ install_others:	all
+-	if [ -f gvx.MESA ]; then ${INSTALL} -m 775 -O -v -F ${GEOM}/bin/${MACHTYPE} gvx.MESA; fi
+-	if [ -f gvx.C3D ]; then ${INSTALL} -m 775 -O -v -F ${GEOM}/bin/${MACHTYPE} gvx.C3D; fi
+-	if [ -f gvx.X11 ]; then ${INSTALL} -m 775 -O -v -F ${GEOM}/bin/${MACHTYPE} gvx.X11; fi
++	if [ -f gvx.MESA ]; then ${INSTALL} -m 755 -O -v -F ${GEOM}/bin/${MACHTYPE} gvx.MESA; fi
++	if [ -f gvx.C3D ]; then ${INSTALL} -m 755 -O -v -F ${GEOM}/bin/${MACHTYPE} gvx.C3D; fi
++	if [ -f gvx.X11 ]; then ${INSTALL} -m 755 -O -v -F ${GEOM}/bin/${MACHTYPE} gvx.X11; fi
+ 
+ _always:
+ 
+@@ -40,10 +40,13 @@
+ MESA C3D X11:
+ 	cd O.${MACHTYPE}; ${MAKE} $@
  
 -install_script: demand_GEOMROOT geomview
 +install_script: demand_GEOMROOT
  	sed -e 's|^GEOMROOT=.*$$|GEOMROOT=${GEOMROOT}|' \
 -		-e 's/^MACHTYPE=.*/MACHTYPE=${MACHTYPE}/' < geomview-x11 > geomview
+-	${INSTALL} -m 775 -O -v -F ${BINDIR} geomview
 +		-e 's/^MACHTYPE=.*/MACHTYPE=${MACHTYPE}/' \
 +		-e '/_GVX/s|$${GEOMROOT}|${PREFIX}/libexec/geomview|' \
 +		-e '/_EMODULE/s|$${GEOMROOT}|${PREFIX}/libexec/geomview|' \
 +			< geomview-x11 > geomview
- 	${INSTALL} -m 775 -O -v -F ${BINDIR} geomview
++	${INSTALL} -m 755 -O -v -F ${BINDIR} geomview
  
  clang:	_always
+ 	@echo "lisp2c ..."
diff --git a/graphics/geomview/files/patch-ag b/graphics/geomview/files/patch-ag
index 6be7fb48931a..66ec0c5e3c3b 100644
--- a/graphics/geomview/files/patch-ag
+++ b/graphics/geomview/files/patch-ag
@@ -1,6 +1,15 @@
---- makefiles/Makerules.allsrc.orig	Tue Jan 18 16:04:06 2000
-+++ makefiles/Makerules.allsrc	Tue Jan 18 16:04:30 2000
-@@ -65,18 +65,18 @@
+--- makefiles/Makerules.allsrc.orig	Fri Nov  1 11:44:17 1996
++++ makefiles/Makerules.allsrc	Tue Aug 15 03:20:24 2000
+@@ -10,7 +10,7 @@
+           for h in $$incs ; do \
+ 	    cmp -s $$h ${GEOM}/include/$$h || i="$$i $$h" ; \
+ 	  done; \
+-	  test -n "$$i" && ${INSTALL} -O -v -m 664 -F ${GEOM}/include $$i || :)
++	  test -n "$$i" && ${INSTALL} -O -v -m 644 -F ${GEOM}/include $$i || :)
+ 	@for d in ${DIRS_THIS_MACH_NO_OBJ}; do (${CDd}; ${MAKE} SITE=${SITE} $@); done
+ 
+ 
+@@ -65,34 +65,34 @@
  # Copy ${MANDIR} to a shell variable in case it includes trailing blanks.
  	
  formatman:
@@ -31,3 +40,22 @@
  
  installman:
  	@mans="${MANS}"; mandir=${MANDIR}; \
+ 	for f in $$mans ; do \
+   	  mdir=$$mandir/man`expr "$$f" : ".*\(.\)"` ; \
+-	  ${INSTALL} -O -v -m 664 -F $$mdir $$f || : ; \
++	  ${INSTALL} -O -v -m 644 -F $$mdir $$f || : ; \
+ 	done;
+ 
+ installmma:	${MMAPKGS}
+ 	@if [ "${MMAPKGS}" ] ; then \
+-	  ${INSTALL} -m 664 -O -v -F ${MMAPACKAGEDIR} ${MMAPKGS} \
++	  ${INSTALL} -m 644 -O -v -F ${MMAPACKAGEDIR} ${MMAPKGS} \
+ 	; fi	
+ 
+ installdoc:	${DOCS}
+ 	@if [ "${DOCS}" ] ; then \
+-	  ${INSTALL} -m 664 -O -v -F ${GEOM}/doc ${DOCS} \
++	  ${INSTALL} -m 644 -O -v -F ${GEOM}/doc ${DOCS} \
+ 	; fi
+ 
+ include ${MKFILEDIR}/Makerules.clean
diff --git a/graphics/geomview/files/patch-ai b/graphics/geomview/files/patch-ai
new file mode 100644
index 000000000000..830a40a0b802
--- /dev/null
+++ b/graphics/geomview/files/patch-ai
@@ -0,0 +1,11 @@
+--- makefiles/Makerules.allobj.orig	Tue Aug 15 03:17:24 2000
++++ makefiles/Makerules.allobj	Tue Aug 15 03:17:39 2000
+@@ -44,7 +44,7 @@
+ 	echo -rm -f *.c
+ 
+ installbin:	${TARGETS}
+-	${INSTALL} -m 775 -O -v -F ${BINDIR} ${TARGETS}
++	${INSTALL} -m 755 -O -v -F ${BINDIR} ${TARGETS}
+ 
+ include ${MKFILEDIR}/Makedefs.SUBDIRS
+ include ${MKFILEDIR}/Makerules.clean
diff --git a/graphics/geomview/files/patch-aj b/graphics/geomview/files/patch-aj
new file mode 100644
index 000000000000..226be7e22233
--- /dev/null
+++ b/graphics/geomview/files/patch-aj
@@ -0,0 +1,14 @@
+--- ./src/bin/flythrough/Makefile.orig	Tue Aug 15 03:39:22 2000
++++ ./src/bin/flythrough/Makefile	Tue Aug 15 03:39:30 2000
+@@ -15,9 +15,9 @@
+ installdata:
+ 	case ${INSTALL} in ..*) install=../${INSTALL} ;; *) install=${INSTALL} ;; esac; \
+ 	cd data; \
+-	  $$install -O -v -m 664 -F ${GEOM}/../data/geom \
++	  $$install -O -v -m 644 -F ${GEOM}/../data/geom \
+ 		 flythrough_diagram.gv dodec.vect ; \
+-	  $$install -O -v -m 664 -F ${GEOM}/../data/groups *.?.gv *.tlist
++	  $$install -O -v -m 644 -F ${GEOM}/../data/groups *.?.gv *.tlist
+ 
+ 
+ SED = 	sed \
diff --git a/graphics/geomview/files/patch-ak b/graphics/geomview/files/patch-ak
new file mode 100644
index 000000000000..45b561cc7128
--- /dev/null
+++ b/graphics/geomview/files/patch-ak
@@ -0,0 +1,11 @@
+--- src/bin/geomview/x11/Makefile.obj.orig	Tue Aug 15 03:42:07 2000
++++ src/bin/geomview/x11/Makefile.obj	Tue Aug 15 03:42:14 2000
+@@ -23,7 +23,7 @@
+ # "geomview" script expects it in the former location.
+ install_bin:	gvx
+ 	${INSTALL} -O -v -F ${GEOM}/bin/${MACHTYPE} gvx
+-	( cd ${GEOM}/bin/${MACHTYPE} ; chmod 775 gvx )
++	( cd ${GEOM}/bin/${MACHTYPE} ; chmod 755 gvx )
+ 
+ ${COMMON_OBJS} :
+ 	rm -f $@ ${@:o=c}