Change INSTALL_DATA to install with mode 644

Remove patches and hacks that were used to work around the previous
situation
This allows to stage more ports as a regular user

Differential Revision:	https://reviews.freebsd.org/D703
Reviewed by and discussed with:	bapt
With hat:	portmgr

63 files changed, 54 insertions, 352 deletions

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index d11232922d7a..ee147bb21240 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -2201,6 +2201,8 @@ _SHROWNGRP=
 _MANOWNGRP=
 .endif
 
+_SHAREMODE?=	0644
+
 # A few aliases for *-install targets
 INSTALL_PROGRAM= \
 	${INSTALL} ${COPY} ${STRIP} ${_BINOWNGRP} -m ${BINMODE}
@@ -2211,7 +2213,7 @@ INSTALL_LIB= \
 INSTALL_SCRIPT= \
 	${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE}
 INSTALL_DATA= \
-	${INSTALL} ${COPY} ${_SHROWNGRP} -m ${SHAREMODE}
+	${INSTALL} ${COPY} ${_SHROWNGRP} -m ${_SHAREMODE}
 INSTALL_MAN= \
 	${INSTALL} ${COPY} ${_MANOWNGRP} -m ${MANMODE}
 
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 026565e6d151..b774c3a81c4d 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -45,7 +45,6 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -E 's/(md5|sha1|sha256)sum/g&/g' \
 		${WRKSRC}/scripts/Dpkg/Checksums.pm
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/lib/*/Makefile.in
 	@${REINPLACE_CMD} -e 's/cp -p $$(DEST/mv $$(DEST/g; s/rm $$(/rm -f $$(/g' \
 		${WRKSRC}/scripts/mk/Makefile.in \
 		${WRKSRC}/scripts/Makefile.in
diff --git a/astro/libroadnav/files/patch-src-Makefile.in b/astro/libroadnav/files/patch-src-Makefile.in
deleted file mode 100644
index da748ec93792..000000000000
--- a/astro/libroadnav/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	2007-10-09 05:44:26.000000000 +0400
-+++ src/Makefile.in	2008-08-02 23:28:08.000000000 +0400
-@@ -354,8 +354,6 @@
- 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    p=$(am__strip_dir) \
--	    echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
--	    $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
- 	  else :; fi; \
- 	done
- 
diff --git a/benchmarks/iperf3/Makefile b/benchmarks/iperf3/Makefile
index 0a8f73353e98..88b230415503 100644
--- a/benchmarks/iperf3/Makefile
+++ b/benchmarks/iperf3/Makefile
@@ -22,13 +22,6 @@ PORTDOCS=	AUTHORS README.md RELEASE_NOTES
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
 post-patch:
-# automake generates a buggy Makefile.in that tries to do ${RANLIB} on
-# libiperf3.a after installing with mode 444; this breaks staging.
-# Since ${RANLIB} was already run on the library, this broken
-# invocation was redundant, and can be eliminated.  The fix below is
-# based on the solution for a similar situation for an unrelated port
-# in r339298.
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/src/Makefile.in
 # Don't build stuff that we're not going to install.  Among other
 # things this means we're not going to try to build profiled objects
 # and/or executables.
diff --git a/chinese/gugod-clean/Makefile b/chinese/gugod-clean/Makefile
index 38d65d07f932..5d3d585f05bc 100644
--- a/chinese/gugod-clean/Makefile
+++ b/chinese/gugod-clean/Makefile
@@ -18,14 +18,10 @@ FONTFILES=	gugod16.bdf gugod18.bdf gugod20.bdf gugod22.bdf
 
 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
-SHAREMODE=	644
 XFONTDIR=	${LOCALBASE}/lib/X11/fonts/local
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${XFONTDIR}
-.for i in ${FONTFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${XFONTDIR}
-.endfor
-	@cd ${STAGEDIR}${XFONTDIR} ; mkfontdir
+	${INSTALL_DATA} ${FONTFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${XFONTDIR}
 
 .include <bsd.port.mk>
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 09e7894eca4f..4f0b55baf660 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -29,8 +29,4 @@ NLS_CONFIGURE_OFF=	--disable-nls
 DESKTOP_ENTRIES="${PORTNAME}" "${COMMENT}" "${PORTNAME}.xpm" \
 	"${PORTNAME}" "Utility;" ${FALSE}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/@INSTALL_DATA@/${INSTALL} -m 644/' \
-		${WRKSRC}/data/desktop/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile
index a1a5d2601662..bff5c9dcee1b 100644
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@@ -279,11 +279,6 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|^\(pkginclude_HEADERS =\).*|\1|" ${WRKSRC}/cmd-line-utils/libedit/Makefile.in
 	@${REINPLACE_CMD} -e "s|^\(install-data-am:\) install-pkgincludeHEADERS|\1|g" ${WRKSRC}/extra/Makefile.in ${WRKSRC}/include/Makefile.in
 	@${REINPLACE_CMD} -e "s|^\(install-exec-am:\) install-pkglibLTLIBRARIES|\1|g" ${WRKSRC}/libmysql/Makefile.in
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/libservices/Makefile.in \
-		${WRKSRC}/mysys/Makefile.in ${WRKSRC}/strings/Makefile.in \
-		${WRKSRC}/dbug/Makefile.in ${WRKSRC}/storage/myisam/Makefile.in \
-		${WRKSRC}/storage/heap/Makefile.in ${WRKSRC}/storage/maria/Makefile.in \
-		${WRKSRC}/storage/myisammrg/Makefile.in ${WRKSRC}/vio/Makefile.in
 
 .endif	# .if !defined(MARIADB_CLIENT_SLAVE)
 .endif	# .if !defined(MARIADB_SCRIPTS_SLAVE)
diff --git a/devel/dprog/files/patch-Makefile.in b/devel/dprog/files/patch-Makefile.in
index 477714d0de1d..b819f9e093d8 100644
--- a/devel/dprog/files/patch-Makefile.in
+++ b/devel/dprog/files/patch-Makefile.in
@@ -27,19 +27,3 @@
  cxx_dprog_test_LDFLAGS =
  am_dprog_OBJECTS = lexer.$(OBJEXT) parser.$(OBJEXT) ast.$(OBJEXT) \
  	pretty_printer.$(OBJEXT) range_checking.$(OBJEXT) \
-@@ -315,6 +315,7 @@
- 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-+	    $(RANLIB) $$p; \
- 	    echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \
- 	    $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
- 	  else :; fi; \
-@@ -324,7 +325,6 @@
- 	  if test -f $$p; then \
- 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
- 	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
--	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- 	  else :; fi; \
- 	done
- 
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index bbe7fb1d9b47..485995d99972 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -53,7 +53,6 @@ CPPFLAGS+=	-DRUN_AS_EUID=1
 
 post-patch:
 	@${REINPLACE_CMD} "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/server/gam_conf.c
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/lib/Makefile.in
 
 .if !defined(GAMIN_SLAVE)
 regression-test: build
diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index a4bde4c1c70d..7933c7bdbb39 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -42,7 +42,6 @@ post-patch:
 	    -e 's|-DSOAPCPP_IMPORT_PATH=|-DSOAPCPP2_IMPORT_PATH=|' \
 	    -e 's|-DWSDL_IMPORT_PATH=|-DWSDL2H_IMPORT_PATH=|' \
 	    ${WRKSRC}/${CONFIGURE_SCRIPT}
-	${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/gsoap/Makefile.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gsoap
diff --git a/devel/inilib/Makefile b/devel/inilib/Makefile
index dc561e23d0fe..1fc2ce4f8882 100644
--- a/devel/inilib/Makefile
+++ b/devel/inilib/Makefile
@@ -11,7 +11,4 @@ COMMENT=	C++ lib which provides a method of saving the "state" of a program
 
 GNU_CONFIGURE=	yes
 
-post-patch:
-	${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/src/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/devel/libavl/Makefile b/devel/libavl/Makefile
index 28cc2bcbb5a9..394a5a4b51fa 100644
--- a/devel/libavl/Makefile
+++ b/devel/libavl/Makefile
@@ -15,7 +15,4 @@ GNU_CONFIGURE=	yes
 
 INFO=		avl
 
-post-patch:
-	${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/devel/libdap/files/patch-tests-Makefile.in b/devel/libdap/files/patch-tests-Makefile.in
deleted file mode 100644
index d5d1f13748b4..000000000000
--- a/devel/libdap/files/patch-tests-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/Makefile.in.orig	2014-04-25 02:36:57.000000000 +0800
-+++ tests/Makefile.in	2014-04-29 09:42:04.506722750 +0800
-@@ -868,7 +868,7 @@
- 	  if test -f $$p; then \
- 	    $(am__strip_dir) \
- 	    echo " ( cd '$(DESTDIR)$(libdir)' && $(RANLIB) $$f )"; \
--	    ( cd "$(DESTDIR)$(libdir)" && $(RANLIB) $$f ) || exit $$?; \
-+	    ( cd "$(DESTDIR)$(libdir)" && chmod u+w $$f && $(RANLIB) $$f && chmod u-w $$f) || exit $$?; \
- 	  else :; fi; \
- 	done
- 
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index 7674a578f427..b96d187ffff3 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -58,8 +58,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's, install[_-]docs,,g; /MKINSDIR.*DEST_SLSH_DOC_DIR/d' \
 		${WRKSRC}/src/Makefile.in \
 		${WRKSRC}/slsh/Makefile.in
-	@${REINPLACE_CMD} -e '/RANLIB.*DEST_LIBDIR/d' \
-		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's,INSTALL_MODULE,INSTALL_LIB,g' \
 		${WRKSRC}/modules/Makefile.in
 
diff --git a/devel/libtai/Makefile b/devel/libtai/Makefile
index 4cc2e1419e09..e3e70bccc82b 100644
--- a/devel/libtai/Makefile
+++ b/devel/libtai/Makefile
@@ -51,8 +51,7 @@ post-build:
 		${WRKSRC}/leapsecs.dat
 
 do-install:
-	${INSTALL_DATA} -m 644 \
-		${WRKSRC}/leapsecs.dat ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/leapsecs.dat ${STAGEDIR}${PREFIX}/etc
 .for i in ${MAN_FILES}
 	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/man/man3
 .endfor
diff --git a/devel/msp430-gcc/files/patch-libgcc-Makefile.in b/devel/msp430-gcc/files/patch-libgcc-Makefile.in
deleted file mode 100644
index 16eed4be1f7d..000000000000
--- a/devel/msp430-gcc/files/patch-libgcc-Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- libgcc/Makefile.in.orig	2011-01-26 07:19:58.000000000 +0300
-+++ libgcc/Makefile.in	2012-04-08 17:22:26.000000000 +0400
-@@ -878,6 +878,7 @@
- 	  $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/;	\
- 	  case $$file in 					\
- 	    *.a)						\
-+	      chmod 644 $(gcc_objdir)$(MULTISUBDIR)/$$file ;  	\
- 	      $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file ;;	\
- 	  esac;							\
- 	done
-@@ -915,6 +916,7 @@
- 	  $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/;	\
- 	  case $$file in 					\
- 	    *.a)						\
-+	      chmod 644 $(gcc_objdir)$(MULTISUBDIR)/$$file ;  	\
- 	      $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file ;;	\
- 	  esac;							\
- 	done
-@@ -974,6 +976,7 @@
- 	  $(INSTALL_DATA) $$file $(DESTDIR)$(inst_libdir)/;	\
- 	  case $$file in 					\
- 	    *.a)						\
-+	      chmod 644 $(gcc_objdir)$(MULTISUBDIR)/$$file ;  	\
- 	      $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file ;;	\
- 	  esac;							\
- 	done
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index c682a2c465de..062e7cf7df98 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -17,7 +17,6 @@ LICENSE=	MIT
 
 RELEASE=	5.9
 
-SHAREMODE=	0644
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=../configure
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
diff --git a/devel/ncurses/files/patch-no-double-ranlib b/devel/ncurses/files/patch-no-double-ranlib
deleted file mode 100644
index 7698d71054f3..000000000000
--- a/devel/ncurses/files/patch-no-double-ranlib
+++ /dev/null
@@ -1,10 +0,0 @@
---- mk-1st.awk.orig	2010-08-07 22:42:30.000000000 +0200
-+++ mk-1st.awk	2013-11-05 16:30:42.386549863 +0100
-@@ -439,7 +439,6 @@
- 					symlink("libncurses.a", "libcurses.a")
- 					printf ")\n"
- 				}
--				printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name
- 				if ( host == "vxworks" )
- 				{
- 					printf "\t@echo installing ../lib/lib%s$o as $(DESTDIR)$(libdir)/lib%s$o\n", name, name
diff --git a/devel/sdts++/files/patch-sysutils__Makefile.in b/devel/sdts++/files/patch-sysutils__Makefile.in
deleted file mode 100644
index 76151f3fe1f8..000000000000
--- a/devel/sdts++/files/patch-sysutils__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sysutils/Makefile.in.orig	2003-06-10 22:47:15.000000000 +0400
-+++ sysutils/Makefile.in	2014-07-02 21:51:45.000000000 +0400
-@@ -216,8 +216,6 @@
- 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
--	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
--	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- 	  else :; fi; \
- 	done
- 
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 5b36b7a342c4..ef456ad453af 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -32,7 +32,4 @@ CONFIGURE_ARGS+=--disable-nls --without-libiconv-prefix --without-libintl-prefix
 
 INSTALL_TARGET=	install install-man
 
-post-patch:
-	 @${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/dns/idnkit/Makefile b/dns/idnkit/Makefile
index ffeca56ddd3e..3f5831ce75ad 100644
--- a/dns/idnkit/Makefile
+++ b/dns/idnkit/Makefile
@@ -16,7 +16,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} \
 		--enable-runidn \
 		--enable-extra-ace
-SHAREMODE=	644 # needed for libtool which runs ranlib on install
 
 USE_LDCONFIG=	yes
 
diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile
index 82480b5507b9..4ee9a12df42e 100644
--- a/ftp/vsftpd/Makefile
+++ b/ftp/vsftpd/Makefile
@@ -94,7 +94,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}/var/ftp ${STAGEDIR}${PREFIX}/share/vsftpd/empty
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} -m 644 ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 .for i in EXAMPLE SECURITY
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
 	${CP} -p -R -L ${WRKSRC}/${i}/./ ${STAGEDIR}${DOCSDIR}/${i}/
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index fff17aaa10a6..cec224e989d7 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -36,10 +36,10 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCS=		README
 
-# For gmake>=3.82 + ranlib runs twice
+# For gmake>=3.82
 pre-configure:
 	${FIND} ${WRKSRC} -name Makefile.in -print | ${XARGS} \
-		${REINPLACE_CMD} -e 's,^dnl,# dnl,;/echo.*RANLIB/,+1d'
+		${REINPLACE_CMD} -e 's,^dnl,# dnl,'
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/games/tetrinet-x/Makefile b/games/tetrinet-x/Makefile
index 38b833890091..36b01e230626 100644
--- a/games/tetrinet-x/Makefile
+++ b/games/tetrinet-x/Makefile
@@ -27,10 +27,10 @@ do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/tetrix.freebsd ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/server-query ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} -m 644 ${WRKSRC}/bin/game.conf ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} -m 644 ${WRKSRC}/bin/game.log ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} -m 644 ${WRKSRC}/bin/game.secure ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} -m 644 ${WRKSRC}/bin/game.winlist ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/bin/game.conf ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/bin/game.log ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/bin/game.secure ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/bin/game.winlist ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} -m 751 ${WRKDIR}/tetrinetx ${STAGEDIR}${PREFIX}/etc/rc.d
 
 .include <bsd.port.mk>
diff --git a/graphics/O2-tools/Makefile b/graphics/O2-tools/Makefile
index 5694f7abf6bf..a6406e99e99a 100644
--- a/graphics/O2-tools/Makefile
+++ b/graphics/O2-tools/Makefile
@@ -11,7 +11,4 @@ COMMENT=	Huge image processing tools and libraries
 
 GNU_CONFIGURE=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/libsrc/*/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/graphics/epix/Makefile b/graphics/epix/Makefile
index 30f1e4c2d40b..44891f071e74 100644
--- a/graphics/epix/Makefile
+++ b/graphics/epix/Makefile
@@ -26,7 +26,6 @@ INFO=		epix
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/usepackage/s|pstricks,xcolor|pstricks,tikz,xcolor|' \
 		${WRKSRC}/doc/manual.tex
 
diff --git a/graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in b/graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in
index c4d5ae2a863f..62683f918f6a 100644
--- a/graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in
+++ b/graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in
@@ -1,5 +1,5 @@
---- Source/NCSBuildGnu/Makefile.in.orig	2006-08-29 08:57:09.000000000 +0100
-+++ Source/NCSBuildGnu/Makefile.in	2013-12-21 00:03:30.000000000 +0000
+--- Source/NCSBuildGnu/Makefile.in.orig	2006-08-29 07:57:09 UTC
++++ Source/NCSBuildGnu/Makefile.in
 @@ -246,22 +246,6 @@
  	../C/NCSEcw/shared_src/qmf_util.c \
  	../C/NCSEcw/shared_src/quantize.c \
@@ -96,16 +96,7 @@
  @AMDEP_TRUE@	./$(DEPDIR)/collapse_pyr.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/compress.Plo ./$(DEPDIR)/dynamiclib.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/ecw_open.Plo ./$(DEPDIR)/ecw_read.Plo \
-@@ -1036,8 +977,6 @@
- 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
--	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
--	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- 	  else :; fi; \
- 	done
- 
-@@ -1321,22 +1260,6 @@
+@@ -1321,22 +1262,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-NCSWorldFile.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-NCScnet.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-build_pyr.Po@am__quote@
@@ -128,7 +119,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-collapse_pyr.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-compress.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-dynamiclib.Po@am__quote@
-@@ -1364,22 +1287,6 @@
+@@ -1364,22 +1289,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-unpack.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-util.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/build_pyr.Plo@am__quote@
@@ -151,7 +142,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collapse_pyr.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamiclib.Plo@am__quote@
-@@ -1935,534 +1842,6 @@
+@@ -1935,534 +1844,6 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(______lib_libecwj2_a_CPPFLAGS) $(CPPFLAGS) $(______lib_libecwj2_a_CFLAGS) $(CFLAGS) -c -o ______lib_libecwj2_a-unpack.lo `test -f '../C/NCSEcw/shared_src/unpack.c' || echo '$(srcdir)/'`../C/NCSEcw/shared_src/unpack.c
  
@@ -686,7 +677,7 @@
  ______lib_libecwj2_a-dynamiclib.o: ../C/NCSUtil/dynamiclib.c
  @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(______lib_libecwj2_a_CPPFLAGS) $(CPPFLAGS) $(______lib_libecwj2_a_CFLAGS) $(CFLAGS) -MT ______lib_libecwj2_a-dynamiclib.o -MD -MP -MF "$(DEPDIR)/______lib_libecwj2_a-dynamiclib.Tpo" \
  @am__fastdepCC_TRUE@	  -c -o ______lib_libecwj2_a-dynamiclib.o `test -f '../C/NCSUtil/dynamiclib.c' || echo '$(srcdir)/'`../C/NCSUtil/dynamiclib.c; \
-@@ -3288,534 +2667,6 @@
+@@ -3288,534 +2669,6 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unpack.lo `test -f '../C/NCSEcw/shared_src/unpack.c' || echo '$(srcdir)/'`../C/NCSEcw/shared_src/unpack.c
  
diff --git a/lang/pharo/Makefile b/lang/pharo/Makefile
index ddebf4bd274d..eee97ea1a0be 100644
--- a/lang/pharo/Makefile
+++ b/lang/pharo/Makefile
@@ -21,8 +21,6 @@ SVNVERSION=	14438
 NO_BUILD=	yes
 USES=		zip
 
-SHAREMODE=	644
-
 DIST_SUBDIR=	squeak
 
 FILES_DIR=	${WRKDIR}/Pharo-${DISTVERSION}-${SVNVERSION}/
@@ -35,8 +33,6 @@ PLIST_FILES=	lib/squeak/Pharo-${DISTVERSION}.image \
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/squeak
-.for f in ${FILES_TO_INSTALL}
-	(cd ${FILES_DIR} && ${INSTALL_DATA} ${f} ${STAGEDIR}${PREFIX}/lib/squeak/)
-.endfor
+	${INSTALL_DATA} ${FILES_TO_INSTALL:S,^,${FILES_DIR}/,} ${STAGEDIR}${PREFIX}/lib/squeak
 
 .include <bsd.port.mk>
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 9366bf75b10e..ca1ecd8cbac1 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -27,8 +27,7 @@ CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ENV+=		ac_cv_opt_olimit_ok=no OPT=""				# Null out OPT to respect user CFLAGS and remove optimizations
 
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
-SHAREMODE=		644							# Match upstream INSTALL_DATA=644, so we can STRIP shared libraries
-MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Override read-only for libraries, so we can STRIP them
+MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
 
 PLIST_SUB=		ABI=${ABIFLAGS} \
@@ -113,7 +112,6 @@ post-patch:
 post-install:
 	for i in ${STAGEDIR}${PREFIX}/lib/python2.7/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done						# Strip shared extensions
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpython2.7.so.1			# Strip shared library
 
 regression-test: build
 	@cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest
diff --git a/lang/python27/files/patch-Makefile.pre.in b/lang/python27/files/patch-Makefile.pre.in
index 7773e0d8856b..4357211564a7 100644
--- a/lang/python27/files/patch-Makefile.pre.in
+++ b/lang/python27/files/patch-Makefile.pre.in
@@ -1,14 +1,6 @@
 # Description: Link scripts in the same way Python3 does
 # Submitted by: mva
 
-# Description: Run pycompile only once
-# Submitted by: antoine (r350207)
-# TODO: ?
-
-# Description: Run ranlib before installing the library read-only
-# Submitted by: antoine@ (r350207)
-# TODO: Upstream
-
 --- Makefile.pre.in.orig	2014-06-30 04:05:39.000000000 +0200
 +++ Makefile.pre.in	2014-07-26 11:09:46.000000000 +0200
 @@ -868,6 +868,12 @@
@@ -24,28 +16,3 @@
  
  # Install the interpreter with $(VERSION) affixed
  # This goes into $(exec_prefix)
-@@ -1010,12 +1016,12 @@
- 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
- 	fi
- 	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
-+		$(PYTHON_FOR_BUILD) -B -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
- 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- 		$(DESTDIR)$(LIBDEST)
- 	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
-+		$(PYTHON_FOR_BUILD) -B -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
- 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- 		$(DESTDIR)$(LIBDEST)
-@@ -1093,8 +1099,8 @@
- 			if test "$(SO)" = .dll; then \
- 				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
- 			else \
-+				$(RANLIB) $(LIBRARY) ; \
- 				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
--				$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
- 			fi; \
- 		else \
- 			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index f97ce815b92d..d6f21c1889be 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -27,8 +27,7 @@ CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ENV+=		OPT=""							# Null out OPT to respect user CFLAGS and remove optimizations
 
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
-SHAREMODE=		644							# Match upstream INSTALL_DATA=644, so we can STRIP shared libraries
-MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Override read-only for libraries, so we can STRIP them
+MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
 
 PLIST_SUB=		ABI=${ABIFLAGS} \
@@ -118,10 +117,9 @@ post-install:
 	# Upstream Issue: http://bugs.python.org/issue17975
 	${RM} -f ${STAGEDIR}${PREFIX}/lib/libpython3.so
 .endif
-	# Strip shared extensions and shared library
+	# Strip shared extensions
 	for i in ${STAGEDIR}${PREFIX}/lib/python3.2/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpython3.2${ABIFLAGS}.so.1
 
 regression-test: build
 	@cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest
diff --git a/lang/python32/files/patch-Makefile.pre.in b/lang/python32/files/patch-Makefile.pre.in
index e6747e02c186..b728834507c3 100644
--- a/lang/python32/files/patch-Makefile.pre.in
+++ b/lang/python32/files/patch-Makefile.pre.in
@@ -5,10 +5,6 @@
 # Submitted by: koobs (r326729)
 # TODO: Upstream
 
-# Description: Run ranlib before installing the library read-only
-# Submitted by: antoine@ (r350207)
-# TODO: Upstream
-
 --- Makefile.pre.in.orig	2013-05-15 18:33:51.000000000 +0200
 +++ Makefile.pre.in	2014-07-18 20:54:36.000000000 +0200
 @@ -60,7 +60,7 @@
@@ -76,16 +72,6 @@
  	-rm -f $(DESTDIR)$(BINDIR)/python3-config
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
  	-rm -f $(DESTDIR)$(LIBPC)/python3.pc
-@@ -1108,8 +1102,8 @@
- 			if test "$(SHLIB_SUFFIX)" = .dll; then \
- 				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
- 			else \
-+				$(RANLIB) $(LIBRARY) ; \
- 				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
--				$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
- 			fi; \
- 		else \
- 			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
 @@ -1126,6 +1120,12 @@
  	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
  	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index 2cb14b222db6..c7872f59ff29 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -27,8 +27,7 @@ CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ENV+=		OPT=""							# Null out OPT to respect user CFLAGS and remove optimizations
 
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
-SHAREMODE=		644							# Match upstream INSTALL_DATA=644, so we can STRIP shared libraries
-MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Override read-only for libraries, so we can STRIP them
+MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
 
 PLIST_SUB=		ABI=${ABIFLAGS} \
@@ -99,7 +98,6 @@ post-install:
 .endif
 	for i in ${STAGEDIR}${PREFIX}/lib/python3.3/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done								# Strip shared extensions
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpython3.3${ABIFLAGS}.so.1			# Strip shared library
 
 regression-test: build
 	@cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest
diff --git a/lang/python33/files/patch-Makefile.pre.in b/lang/python33/files/patch-Makefile.pre.in
index b904dbaaa3f6..1c2bfa4c4ade 100644
--- a/lang/python33/files/patch-Makefile.pre.in
+++ b/lang/python33/files/patch-Makefile.pre.in
@@ -4,10 +4,6 @@
 # Submitted by: koobs (r326729)
 # TODO: Upstream
 
-# Description: Run ranlib before installing the library read-only
-# Submitted by: antoine@ (r350207)
-# TODO: Upstream
-
 # Description: Create symlinks for non-ABI-suffixed python*-config and ABI-suffixed python-*.pc
 # Submitted by: antoine@ (r358029)
 # TODO: Upstream
@@ -96,16 +92,6 @@
  	-rm -f $(DESTDIR)$(BINDIR)/python3-config
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
  	-rm -f $(DESTDIR)$(LIBPC)/python3.pc
-@@ -1205,8 +1199,8 @@
- 			if test "$(SHLIB_SUFFIX)" = .dll; then \
- 				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
- 			else \
-+				$(RANLIB) $(LIBRARY) ; \
- 				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
--				$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
- 			fi; \
- 		else \
- 			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
 @@ -1223,6 +1217,12 @@
  	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
  	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
diff --git a/lang/python34/Makefile b/lang/python34/Makefile
index 066220fdb19a..0608595f0e3d 100644
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@@ -29,8 +29,7 @@ CONFIGURE_ARGS+=	--enable-shared --without-ensurepip
 CONFIGURE_ENV+=		OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}"	# Null out OPT to respect user CFLAGS and remove optimizations
 
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
-SHAREMODE=		644							# Match upstream INSTALL_DATA=644, so we can STRIP shared libraries
-MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Override read-only for libraries, so we can STRIP them
+MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
 
 PLIST_SUB=		ABI=${ABIFLAGS} \
@@ -104,7 +103,6 @@ post-install:
 .endif
 	for i in ${STAGEDIR}${PREFIX}/lib/python3.4/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done								# Strip shared extensions
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpython3.4${ABIFLAGS}.so.1			# Strip shared library
 
 regression-test: build
 	@cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest
diff --git a/lang/python34/files/patch-Makefile.pre.in b/lang/python34/files/patch-Makefile.pre.in
index 3d941d04e953..c50727846803 100644
--- a/lang/python34/files/patch-Makefile.pre.in
+++ b/lang/python34/files/patch-Makefile.pre.in
@@ -2,10 +2,6 @@
 # Submitted by: koobs (r326729)
 # TODO: Upstream
 
-# Description: Run ranlib before installing the library read-only
-# Submitted by: antoine@ (r350207)
-# TODO: Upstream
-
 # Description: Create symlinks for non-ABI-suffixed python*-config and ABI-suffixed python-*.pc
 # Submitted by: antoine@ (r358029)
 # TODO: Upstream
@@ -47,16 +43,6 @@
  	-rm -f $(DESTDIR)$(BINDIR)/python3-config
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
  	-rm -f $(DESTDIR)$(LIBPC)/python3.pc
-@@ -1314,8 +1305,8 @@
- 			if test "$(SHLIB_SUFFIX)" = .dll; then \
- 				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
- 			else \
-+				$(RANLIB) $(LIBRARY) ; \
- 				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
--				$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
- 			fi; \
- 		else \
- 			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
 @@ -1333,6 +1324,12 @@
  	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
  	$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index b2155008058b..c983f2e88ff4 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -53,10 +53,6 @@ SUB_FILES=	pkg-message
 SUB_LIST=	SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR}
 PLIST_SUB=	SQUEAK_LIB_DIR=${SQUEAK_LIB_DIR}
 
-# Plugin image must be writable, because of it copy to user's ~/.npsqueak/ and
-# be updated.
-SHAREMODE=	644
-
 IMAGES=		Squeak${IMAGE_VERSION}/Squeak${IMAGE_VERSION}.image \
 		Squeak${IMAGE_VERSION}/Squeak${IMAGE_VERSION}.changes
 
diff --git a/mail/dma/Makefile b/mail/dma/Makefile
index e64972184dcb..409ef6118c77 100644
--- a/mail/dma/Makefile
+++ b/mail/dma/Makefile
@@ -60,7 +60,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/dma.8 ${STAGEDIR}/${PREFIX}/man/man8/
 	${MKDIR} ${STAGEDIR}/${PREFIX}/etc/dma
 .for i in ${CONFFILES}
-	${INSTALL_DATA} -m 0644 ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/etc/dma/${i}.sample
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/etc/dma/${i}.sample
 .endfor
 	${MKDIR} ${STAGEDIR}/var/spool/dma
 
diff --git a/mail/postfix-policyd-weight/Makefile b/mail/postfix-policyd-weight/Makefile
index 447d8a63bb00..3ec89398681c 100644
--- a/mail/postfix-policyd-weight/Makefile
+++ b/mail/postfix-policyd-weight/Makefile
@@ -32,7 +32,7 @@ NO_BUILD=	yes
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_DATA} -m 644 ${WRKSRC}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/
 	${INSTALL_MAN} ${WRKSRC}/man/man5/policyd-weight.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5/
 	${INSTALL_MAN} ${WRKSRC}/man/man8/policyd-weight.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
 
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 519502e0bb1c..939cde833973 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -19,12 +19,8 @@ COMMENT=	Local mail delivery agent
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-INSTALL_TARGET=	install-suid install.man
+INSTALL_TARGET=	install.bin install.man
 
-PLIST_FILES=	bin/formail bin/lockfile bin/mailstat bin/procmail \
-		man/man1/formail.1.gz man/man1/lockfile.1.gz \
-		man/man1/procmail.1.gz man/man5/procmailex.5.gz \
-		man/man5/procmailrc.5.gz man/man5/procmailsc.5.gz
 PORTDOCS=	FAQ FEATURES HISTORY KNOWN_BUGS README
 PORTEXAMPLES=	1procmailrc 1rmail 2procmailrc 2rmail 3procmailrc 3rmail \
 		advanced dirname forward local_procmail_lmtp.m4 mailstat
diff --git a/mail/procmail/pkg-plist b/mail/procmail/pkg-plist
new file mode 100644
index 000000000000..ea5728893183
--- /dev/null
+++ b/mail/procmail/pkg-plist
@@ -0,0 +1,10 @@
+bin/formail
+@(,mail,2755) bin/lockfile
+bin/mailstat
+@(,mail,6755) bin/procmail
+man/man1/formail.1.gz
+man/man1/lockfile.1.gz
+man/man1/procmail.1.gz
+man/man5/procmailex.5.gz
+man/man5/procmailrc.5.gz
+man/man5/procmailsc.5.gz
diff --git a/mail/py-ppolicy/Makefile b/mail/py-ppolicy/Makefile
index b1b59128519d..244ef84bcd82 100644
--- a/mail/py-ppolicy/Makefile
+++ b/mail/py-ppolicy/Makefile
@@ -47,7 +47,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/TESTS ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ppolicy.sql ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} -m 0644 ${WRKSRC}/ppolicy.conf ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/ppolicy.conf ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/ppolicy.tap ${STAGEDIR}${PREFIX}/sbin
 
 .include <bsd.port.mk>
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index be884520cda1..77eeecdd0a70 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -72,7 +72,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/spamdb/spamdb.8 ${STAGEDIR}${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/spamlogd/spamlogd.8 ${STAGEDIR}${PREFIX}/man/man8
 	${INSTALL} -d ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} -m 644 ${WRKSRC}/etc/spamd.conf ${STAGEDIR}${ETCDIR}/spamd.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/etc/spamd.conf ${STAGEDIR}${ETCDIR}/spamd.conf.sample
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}/
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index e3a8d84b69c6..68264016cf71 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -15,8 +15,6 @@ USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USES=		gmake tar:bzip2
 GROUPS=		ssmtp
-BINMODE=	2555
-SHAREMODE=	640
 
 SUB_FILES+=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -64,7 +62,6 @@ replace:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ssmtp ${STAGEDIR}${PREFIX}/sbin/ssmtp
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/ssmtp
-	@${CHMOD} 750 ${STAGEDIR}${PREFIX}/etc/ssmtp
 	${INSTALL_DATA} ${WRKSRC}/revaliases \
 		${STAGEDIR}${PREFIX}/etc/ssmtp/revaliases.sample
 	${INSTALL_DATA} ${WRKSRC}/ssmtp.conf \
diff --git a/mail/ssmtp/pkg-plist b/mail/ssmtp/pkg-plist
index 23a5d1333215..2078cce27ed8 100644
--- a/mail/ssmtp/pkg-plist
+++ b/mail/ssmtp/pkg-plist
@@ -1,9 +1,6 @@
-@group ssmtp
-sbin/ssmtp
-etc/ssmtp/revaliases.sample
-etc/ssmtp/ssmtp.conf.sample
-@group
+@(,ssmtp,2555) sbin/ssmtp
+@(,ssmtp,640) etc/ssmtp/revaliases.sample
+@(,ssmtp,640) etc/ssmtp/ssmtp.conf.sample
 man/man5/ssmtp.conf.5.gz
 man/man8/ssmtp.8.gz
-@exec chown root:ssmtp %D/etc/ssmtp
-@dirrmtry etc/ssmtp
+@dirrmtry(,ssmtp,750) etc/ssmtp
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index d8f8d5fccc74..8437e5341dc8 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -42,6 +42,6 @@ CONFIGURE_ARGS+=	--disable-crypto
 post-install:
 	@${ECHO_MSG} "===>   Installing sample.wmbiffrc to ${DATADIR}"
 	@${ECHO_MSG} "===>   Modify it to suit your needs and copy to ~/.wmbiffrc"
-	${INSTALL_DATA} -m 644 ${WRKSRC}/wmbiff/sample.wmbiffrc ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/wmbiff/sample.wmbiffrc ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/math/R/Makefile b/math/R/Makefile
index 3988b22bce27..ff15bbb0b936 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -56,7 +56,6 @@ INSTALL_TARGET=		install
 CONFIGURE_ARGS=		--enable-memory-profiling rdocdir=${DOCSDIR} \
 			--with-system-bzlib --with-system-zlib
 CONFIGURE_ENV+=		FCFLAGS="${FFLAGS}" \
-			INSTALL_DATA="${INSTALL} ${COPY} ${_SHROWNGRP} -m 644" \
 			R_LD_LIBRARY_PATH="${R_LD_LIBRARY_PATH}" TAR="${TAR}"
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
diff --git a/multimedia/tivodecode/Makefile b/multimedia/tivodecode/Makefile
index 15b7e65aa219..2b181a15f020 100644
--- a/multimedia/tivodecode/Makefile
+++ b/multimedia/tivodecode/Makefile
@@ -14,9 +14,6 @@ OPTIONS_DEFINE=	DOCS
 USES=		gmake
 GNU_CONFIGURE=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/Makefile.in
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING \
diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile
index 3fd7a56650a0..c96ac5674539 100644
--- a/net-mgmt/flow-tools/Makefile
+++ b/net-mgmt/flow-tools/Makefile
@@ -59,8 +59,6 @@ post-patch:
 	 -e 's|@localstatedir@/sym/|${PREFIX}/share/flow-tools/|' \
 	 -e 's|@localstatedir@/cfg/|${PREFIX}/etc/flow-tools/|' \
 	  ${WRKSRC}/docs/flow-*.1.in ${WRKSRC}/docs/flow-*.html.in
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' \
-		${WRKSRC}/lib/Makefile.in
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/*.1 ${STAGEDIR}${PREFIX}/man/man1/
diff --git a/net-mgmt/mk-livestatus/files/patch-src__Makefile.in b/net-mgmt/mk-livestatus/files/patch-src__Makefile.in
index 0a5f3860c2ff..69491ab6771b 100644
--- a/net-mgmt/mk-livestatus/files/patch-src__Makefile.in
+++ b/net-mgmt/mk-livestatus/files/patch-src__Makefile.in
@@ -9,19 +9,3 @@
  build_alias = @build_alias@
  builddir = @builddir@
  datadir = @datadir@
-@@ -366,15 +366,6 @@
- 	test -z "$$list2" || { \
- 	  echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
- 	  $(INSTALL_DATA) $$list2 "$(DESTDIR)$(pkglibdir)" || exit $$?; }
--	@$(POST_INSTALL)
--	@list='$(pkglib_LIBRARIES)'; test -n "$(pkglibdir)" || list=; \
--	for p in $$list; do \
--	  if test -f $$p; then \
--	    $(am__strip_dir) \
--	    echo " ( cd '$(DESTDIR)$(pkglibdir)' && $(RANLIB) $$f )"; \
--	    ( cd "$(DESTDIR)$(pkglibdir)" && $(RANLIB) $$f ) || exit $$?; \
--	  else :; fi; \
--	done
- 
- uninstall-pkglibLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
diff --git a/net/easysoap/files/patch-src-Makefile.in b/net/easysoap/files/patch-src-Makefile.in
deleted file mode 100644
index 390fd3e38d81..000000000000
--- a/net/easysoap/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	2006-11-10 18:48:39.000000000 +0100
-+++ src/Makefile.in	2009-02-22 13:04:06.000000000 +0100
-@@ -375,6 +375,7 @@
- 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-+	    chmod u+w $(DESTDIR)$(libdir)/$$p; \
- 	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
- 	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- 	  else :; fi; \
diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile
index 06bae38ea855..6baa57a96618 100644
--- a/net/isc-dhcp41-server/Makefile
+++ b/net/isc-dhcp41-server/Makefile
@@ -144,10 +144,6 @@ post-patch:
 		${MSG_FILE} > ${PKGMESSAGE}
 	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/client/dhclient.conf
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' \
-		${WRKSRC}/Makefile.in \
-		${WRKSRC}/*/Makefile.in
-
 
 do-install:
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/${SUBSYS} install
diff --git a/net/isc-dhcp42-server/Makefile b/net/isc-dhcp42-server/Makefile
index 2c052ba29764..3bbc35dc30b5 100644
--- a/net/isc-dhcp42-server/Makefile
+++ b/net/isc-dhcp42-server/Makefile
@@ -140,9 +140,6 @@ post-patch:
 		${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf
 	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/client/dhclient.conf.example
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' \
-		${WRKSRC}/Makefile.in \
-		${WRKSRC}/*/Makefile.in
 
 do-install:
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/${SUBSYS} install
diff --git a/net/isc-dhcp43-server/Makefile b/net/isc-dhcp43-server/Makefile
index 4b2cf5f783cc..747f3aa06e99 100644
--- a/net/isc-dhcp43-server/Makefile
+++ b/net/isc-dhcp43-server/Makefile
@@ -140,9 +140,6 @@ post-patch:
 		${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf
 	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/client/dhclient.conf.example
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' \
-		${WRKSRC}/Makefile.in \
-		${WRKSRC}/*/Makefile.in
 
 do-install:
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/${SUBSYS} install
diff --git a/net/libpcap/files/patch-Makefile.in b/net/libpcap/files/patch-Makefile.in
index 2a4c19f9f21d..d4e133805292 100644
--- a/net/libpcap/files/patch-Makefile.in
+++ b/net/libpcap/files/patch-Makefile.in
@@ -56,11 +56,3 @@
  	for i in $(MANFILE); do \
  		$(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \
  		    $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
-@@ -656,7 +626,6 @@
- 	[ -d $(DESTDIR)$(libdir) ] || \
- 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
- 	$(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
--	$(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
- install-archive-shareda:
- 	#
- 	# AIX, however, doesn't, so we don't install the archive
diff --git a/print/paps/Makefile b/print/paps/Makefile
index 11034c73d615..2c20aeacd490 100644
--- a/print/paps/Makefile
+++ b/print/paps/Makefile
@@ -17,7 +17,4 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	pango
 USES=		pkgconfig
 
-post-patch:
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/src/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index 5abed2f6f06a..44e077765db5 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -36,7 +36,6 @@ USES=		perl5 shebangfix tar:xz
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S!_!-!}
 BINMODE=	755
-SHAREMODE=	640
 SUB_LIST+=	LOGCHECK_USER=${LOGCHECK_USER} \
 		LOGCHECK_GROUP=${LOGCHECK_GROUP} \
 		CRON=${PORT_OPTIONS:MCRON}
@@ -91,7 +90,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/src/detectrotate/*.dtr \
 		${STAGEDIR}${DATADIR}/detectrotate
 	@${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_DATA} -m 0644 ${WRKSRC}/debian/logcheck.cron.d \
+	@${INSTALL_DATA} ${WRKSRC}/debian/logcheck.cron.d \
 		${STAGEDIR}${EXAMPLESDIR}/crontab.in
 	@${ECHO_CMD} '@exec ${CHGRP} -R ${LOGCHECK_GROUP} \
 		${ETCDIR:S|^${PREFIX}/|%D/|} \
@@ -101,6 +100,6 @@ do-install:
 	@${GZIP_CMD} ${STAGEDIR}${MAN8PREFIX}/man/man8/$i
 .endfor
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} -m 0644 ${DOCS} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/security/logcheck/pkg-plist b/security/logcheck/pkg-plist
index a638a1ea63c8..a3ea77dba2d3 100644
--- a/security/logcheck/pkg-plist
+++ b/security/logcheck/pkg-plist
@@ -1,3 +1,4 @@
+@mode 640
 %%ETCDIR%%/cracking.d/kernel
 %%ETCDIR%%/cracking.d/rlogind
 %%ETCDIR%%/cracking.d/rsh
@@ -191,6 +192,7 @@
 %%DATADIR%%/detectrotate/10-savelog.dtr
 %%DATADIR%%/detectrotate/20-logrotate.dtr
 %%DATADIR%%/detectrotate/30-logrotate-dateext.dtr
+@mode
 man/man8/logcheck.8.gz
 man/man8/logtail.8.gz
 man/man8/logtail2.8.gz
diff --git a/sysutils/dateutils/files/patch-lib__Makefile.in b/sysutils/dateutils/files/patch-lib__Makefile.in
deleted file mode 100644
index e64192b709a1..000000000000
--- a/sysutils/dateutils/files/patch-lib__Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./lib/Makefile.in.orig	2014-03-27 23:56:38.000000000 -0400
-+++ ./lib/Makefile.in	2014-03-27 23:57:13.000000000 -0400
-@@ -363,13 +363,6 @@
- 	  $(INSTALL_DATA) $$list2 "$(DESTDIR)$(libdir)" || exit $$?; }
- 	@$(POST_INSTALL)
- 	@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
--	for p in $$list; do \
--	  if test -f $$p; then \
--	    $(am__strip_dir) \
--	    echo " ( cd '$(DESTDIR)$(libdir)' && $(RANLIB) $$f )"; \
--	    ( cd "$(DESTDIR)$(libdir)" && $(RANLIB) $$f ) || exit $$?; \
--	  else :; fi; \
--	done
- 
- uninstall-libLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
diff --git a/textproc/syck/Makefile b/textproc/syck/Makefile
index 8cb695a9c7c5..9f68e7cd6767 100644
--- a/textproc/syck/Makefile
+++ b/textproc/syck/Makefile
@@ -20,7 +20,4 @@ MAKE_JOBS_UNSAFE=	yes
 
 CFLAGS+=	-fPIC
 
-post-patch:
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/lib/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/www/vdradmin-am/Makefile b/www/vdradmin-am/Makefile
index fe402da0acde..9d984d71b17e 100644
--- a/www/vdradmin-am/Makefile
+++ b/www/vdradmin-am/Makefile
@@ -65,7 +65,7 @@ post-patch:
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} -m 644 ${FILESDIR}/vdradmind.conf ${STAGEDIR}${ETCDIR}/vdradmind.conf.sample
+	${INSTALL_DATA} ${FILESDIR}/vdradmind.conf ${STAGEDIR}${ETCDIR}/vdradmind.conf.sample
 	${MKDIR}  ${STAGEDIR}/var/cache/${PORTNAME} \
 		${STAGEDIR}/var/log/${PORTNAME} ${STAGEDIR}/var/run/${PORTNAME}
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} \
diff --git a/x11-toolkits/blt/files/patch-generic_Makefile.in b/x11-toolkits/blt/files/patch-generic_Makefile.in
index bc5a096b55c3..be0a3a5d3a62 100644
--- a/x11-toolkits/blt/files/patch-generic_Makefile.in
+++ b/x11-toolkits/blt/files/patch-generic_Makefile.in
@@ -1,5 +1,5 @@
---- generic/Makefile.in.orig	2010-12-11 10:09:42.000000000 +1030
-+++ generic/Makefile.in	2014-05-06 06:41:23.000000000 +0930
+--- generic/Makefile.in.orig	2010-12-10 23:39:42 UTC
++++ generic/Makefile.in
 @@ -161,6 +161,8 @@
  libvers_a =	libBLT$(version).a
  tcl_only_lib_a =  libBLTlite.a
@@ -14,16 +14,14 @@
  	$(INSTALL) -m 0755 $(bltsh) $(INSTALL_ROOT)$(bindir)
  
 -install-lib: $(lib_a) $(tcl_only_lib_a)
--	$(INSTALL_DATA) $(lib_a) $(INSTALL_ROOT)$(libdir)/$(libvers_a)
 +install-lib: $(lib_a) $(tcl_only_lib_a) $(stub_a)
-+	$(INSTALL_DATA) -m 0644 $(lib_a) $(INSTALL_ROOT)$(libdir)/$(libvers_a)
+ 	$(INSTALL_DATA) $(lib_a) $(INSTALL_ROOT)$(libdir)/$(libvers_a)
  	(cd $(INSTALL_ROOT)$(libdir); $(RM) $(lib_a) ; $(LN_S) $(libvers_a) $(lib_a))
  	$(RANLIB) $(INSTALL_ROOT)$(libdir)/$(libvers_a)
--	$(INSTALL_DATA) $(tcl_only_lib_a) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a)
-+	$(INSTALL_DATA) -m 0644 $(tcl_only_lib_a) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a)
+ 	$(INSTALL_DATA) $(tcl_only_lib_a) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a)
  	(cd $(INSTALL_ROOT)$(libdir); $(RM) $(tcl_only_lib_a) ; $(LN_S) $(tcl_only_libvers_a) $(tcl_only_lib_a))
  	$(RANLIB) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a)
-+	$(INSTALL_DATA) -m 0644 $(stub_a) $(INSTALL_ROOT)$(libdir)/$(stub_libvers_a)
++	$(INSTALL_DATA) $(stub_a) $(INSTALL_ROOT)$(libdir)/$(stub_libvers_a)
 +	(cd $(INSTALL_ROOT)$(libdir); $(RM) $(stub_a) ; $(LN_S) $(stub_libvers_a) $(stub_a))
  	(cd shared; $(MAKE) install) 
  
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index e93f0bf50a20..65cad5c6b375 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -25,7 +25,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread||g ; \
 		 s|-ldl||g ; \
 		 s|-lc_r||g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/src/*/Makefile.in
 	@${ECHO} "JS component is not compiled with new usb stack"
 
 post-build: