Page MenuHomeFreeBSD

D703.id1300.diff
No OneTemporary

D703.id1300.diff

Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -2204,6 +2204,8 @@
_MANOWNGRP=
.endif
+_SHAREMODE?= 0644
+
# A few aliases for *-install targets
INSTALL_PROGRAM= \
${INSTALL} ${COPY} ${STRIP} ${_BINOWNGRP} -m ${BINMODE}
@@ -2214,7 +2216,7 @@
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}
Index: archivers/dpkg/Makefile
===================================================================
--- archivers/dpkg/Makefile
+++ archivers/dpkg/Makefile
@@ -45,7 +45,6 @@
${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
Index: astro/libroadnav/files/patch-src-Makefile.in
===================================================================
--- 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
-
Index: benchmarks/iperf3/Makefile
===================================================================
--- benchmarks/iperf3/Makefile
+++ benchmarks/iperf3/Makefile
@@ -22,13 +22,6 @@
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.
Index: chinese/gugod-clean/Makefile
===================================================================
--- chinese/gugod-clean/Makefile
+++ chinese/gugod-clean/Makefile
@@ -18,14 +18,10 @@
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>
Index: comms/xlog/Makefile
===================================================================
--- comms/xlog/Makefile
+++ comms/xlog/Makefile
@@ -29,8 +29,4 @@
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>
Index: databases/mariadb-server/Makefile
===================================================================
--- databases/mariadb-server/Makefile
+++ databases/mariadb-server/Makefile
@@ -279,11 +279,6 @@
@${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)
Index: devel/dprog/files/patch-Makefile.in
===================================================================
--- devel/dprog/files/patch-Makefile.in
+++ 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
-
Index: devel/gamin/Makefile
===================================================================
--- devel/gamin/Makefile
+++ devel/gamin/Makefile
@@ -53,7 +53,6 @@
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
Index: devel/gsoap/Makefile
===================================================================
--- devel/gsoap/Makefile
+++ devel/gsoap/Makefile
@@ -42,7 +42,6 @@
-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
Index: devel/inilib/Makefile
===================================================================
--- devel/inilib/Makefile
+++ devel/inilib/Makefile
@@ -11,7 +11,4 @@
GNU_CONFIGURE= yes
-post-patch:
- ${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/src/Makefile.in
-
.include <bsd.port.mk>
Index: devel/libavl/Makefile
===================================================================
--- devel/libavl/Makefile
+++ devel/libavl/Makefile
@@ -15,7 +15,4 @@
INFO= avl
-post-patch:
- ${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/Makefile.in
-
.include <bsd.port.mk>
Index: devel/libdap/files/patch-tests-Makefile.in
===================================================================
--- 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
-
Index: devel/libslang2/Makefile
===================================================================
--- devel/libslang2/Makefile
+++ devel/libslang2/Makefile
@@ -58,8 +58,6 @@
@${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
Index: devel/libtai/Makefile
===================================================================
--- devel/libtai/Makefile
+++ devel/libtai/Makefile
@@ -51,8 +51,7 @@
${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
Index: devel/msp430-gcc/files/patch-libgcc-Makefile.in
===================================================================
--- 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
Index: devel/ncurses/Makefile
===================================================================
--- devel/ncurses/Makefile
+++ devel/ncurses/Makefile
@@ -18,7 +18,6 @@
RELEASE= 5.9
-SHAREMODE= 0644
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT=../configure
CONFIGURE_ARGS= --datadir=${PREFIX}/share/misc --disable-overwrite \
Index: devel/ncurses/files/patch-no-double-ranlib
===================================================================
--- 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
Index: devel/sdts++/files/patch-sysutils__Makefile.in
===================================================================
--- 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
-
Index: devel/yasm/Makefile
===================================================================
--- devel/yasm/Makefile
+++ devel/yasm/Makefile
@@ -32,7 +32,4 @@
INSTALL_TARGET= install install-man
-post-patch:
- @${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/Makefile.in
-
.include <bsd.port.mk>
Index: dns/idnkit/Makefile
===================================================================
--- dns/idnkit/Makefile
+++ dns/idnkit/Makefile
@@ -16,7 +16,6 @@
CONFIGURE_ARGS= ${ICONV_CONFIGURE_BASE} \
--enable-runidn \
--enable-extra-ace
-SHAREMODE= 644 # needed for libtool which runs ranlib on install
USE_LDCONFIG= yes
Index: ftp/vsftpd-ext/Makefile
===================================================================
--- ftp/vsftpd-ext/Makefile
+++ ftp/vsftpd-ext/Makefile
@@ -95,7 +95,7 @@
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
.for i in ${DOCFILES}
- ${INSTALL_DATA} -m 644 ${WRKSRC}/${i} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
.for i in EXAMPLE SECURITY
${MKDIR} ${DOCSDIR}/${i}
Index: ftp/vsftpd/Makefile
===================================================================
--- ftp/vsftpd/Makefile
+++ ftp/vsftpd/Makefile
@@ -94,7 +94,7 @@
${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}/
Index: games/pinball/Makefile
===================================================================
--- games/pinball/Makefile
+++ games/pinball/Makefile
@@ -36,10 +36,10 @@
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}
Index: games/tetrinet-x/Makefile
===================================================================
--- games/tetrinet-x/Makefile
+++ games/tetrinet-x/Makefile
@@ -27,10 +27,10 @@
${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>
Index: graphics/O2-tools/Makefile
===================================================================
--- graphics/O2-tools/Makefile
+++ graphics/O2-tools/Makefile
@@ -11,7 +11,4 @@
GNU_CONFIGURE= yes
-post-patch:
- @${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/libsrc/*/Makefile.in
-
.include <bsd.port.mk>
Index: graphics/epix/Makefile
===================================================================
--- graphics/epix/Makefile
+++ graphics/epix/Makefile
@@ -26,7 +26,6 @@
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
Index: graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in
===================================================================
--- graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in
+++ 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
Index: lang/pharo/Makefile
===================================================================
--- lang/pharo/Makefile
+++ lang/pharo/Makefile
@@ -21,8 +21,6 @@
NO_BUILD= yes
USES= zip
-SHAREMODE= 644
-
DIST_SUBDIR= squeak
FILES_DIR= ${WRKDIR}/Pharo-${DISTVERSION}-${SVNVERSION}/
@@ -35,8 +33,6 @@
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>
Index: lang/python27/Makefile
===================================================================
--- lang/python27/Makefile
+++ lang/python27/Makefile
@@ -27,8 +27,7 @@
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-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
Index: lang/python27/files/patch-Makefile.pre.in
===================================================================
--- lang/python27/files/patch-Makefile.pre.in
+++ 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; \
Index: lang/python32/Makefile
===================================================================
--- lang/python32/Makefile
+++ lang/python32/Makefile
@@ -27,8 +27,7 @@
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 @@
# 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
Index: lang/python32/files/patch-Makefile.pre.in
===================================================================
--- lang/python32/files/patch-Makefile.pre.in
+++ 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
Index: lang/python33/Makefile
===================================================================
--- lang/python33/Makefile
+++ lang/python33/Makefile
@@ -27,8 +27,7 @@
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 @@
.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
Index: lang/python33/files/patch-Makefile.pre.in
===================================================================
--- lang/python33/files/patch-Makefile.pre.in
+++ 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
Index: lang/python34/Makefile
===================================================================
--- lang/python34/Makefile
+++ lang/python34/Makefile
@@ -29,8 +29,7 @@
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 @@
.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
Index: lang/python34/files/patch-Makefile.pre.in
===================================================================
--- lang/python34/files/patch-Makefile.pre.in
+++ 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
Index: lang/squeak/Makefile
===================================================================
--- lang/squeak/Makefile
+++ lang/squeak/Makefile
@@ -53,10 +53,6 @@
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
Index: mail/dma/Makefile
===================================================================
--- mail/dma/Makefile
+++ mail/dma/Makefile
@@ -59,7 +59,7 @@
${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
${CHMOD} o-r ${STAGEDIR}/${PREFIX}/etc/dma/auth.conf.sample
${INSTALL} -d -o root -g mail -m 770 ${STAGEDIR}/var/spool/dma
Index: mail/postfix-policyd-weight/Makefile
===================================================================
--- mail/postfix-policyd-weight/Makefile
+++ mail/postfix-policyd-weight/Makefile
@@ -32,7 +32,7 @@
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/
Index: mail/procmail/Makefile
===================================================================
--- mail/procmail/Makefile
+++ mail/procmail/Makefile
@@ -19,12 +19,8 @@
OPTIONS_DEFINE= DOCS EXAMPLES
-INSTALL_TARGET= install-suid install.man
+INSTALL_TARGET= install 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
Index: mail/procmail/pkg-plist
===================================================================
--- /dev/null
+++ mail/procmail/pkg-plist
@@ -0,0 +1,14 @@
+bin/formail
+@mode 2755
+bin/lockfile
+@mode
+bin/mailstat
+@mode 6755
+bin/procmail
+@mode
+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
Index: mail/py-ppolicy/Makefile
===================================================================
--- mail/py-ppolicy/Makefile
+++ mail/py-ppolicy/Makefile
@@ -47,7 +47,7 @@
${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>
Index: mail/spamd/Makefile
===================================================================
--- mail/spamd/Makefile
+++ mail/spamd/Makefile
@@ -72,7 +72,7 @@
${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}/
Index: mail/ssmtp/Makefile
===================================================================
--- mail/ssmtp/Makefile
+++ mail/ssmtp/Makefile
@@ -15,8 +15,6 @@
GNU_CONFIGURE= yes
USES= gmake tar:bzip2
GROUPS= ssmtp
-BINMODE= 2555
-SHAREMODE= 640
SUB_FILES+= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
Index: mail/ssmtp/pkg-plist
===================================================================
--- mail/ssmtp/pkg-plist
+++ mail/ssmtp/pkg-plist
@@ -1,9 +1,13 @@
@group ssmtp
+@mode 2555
sbin/ssmtp
+@mode 640
etc/ssmtp/revaliases.sample
etc/ssmtp/ssmtp.conf.sample
@group
+@mode
man/man5/ssmtp.conf.5.gz
man/man8/ssmtp.8.gz
-@exec chown root:ssmtp %D/etc/ssmtp
+@group ssmtp
@dirrmtry etc/ssmtp
+@group
Index: mail/wmbiff/Makefile
===================================================================
--- mail/wmbiff/Makefile
+++ mail/wmbiff/Makefile
@@ -42,6 +42,6 @@
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>
Index: math/R/Makefile
===================================================================
--- math/R/Makefile
+++ math/R/Makefile
@@ -56,7 +56,6 @@
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
Index: multimedia/tivodecode/Makefile
===================================================================
--- multimedia/tivodecode/Makefile
+++ multimedia/tivodecode/Makefile
@@ -14,9 +14,6 @@
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 \
Index: net-mgmt/flow-tools/Makefile
===================================================================
--- net-mgmt/flow-tools/Makefile
+++ net-mgmt/flow-tools/Makefile
@@ -59,8 +59,6 @@
-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/
Index: net-mgmt/mk-livestatus/files/patch-src__Makefile.in
===================================================================
--- net-mgmt/mk-livestatus/files/patch-src__Makefile.in
+++ 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)
Index: net/easysoap/files/patch-src-Makefile.in
===================================================================
--- 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; \
Index: net/isc-dhcp41-server/Makefile
===================================================================
--- net/isc-dhcp41-server/Makefile
+++ net/isc-dhcp41-server/Makefile
@@ -144,10 +144,6 @@
${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
Index: net/isc-dhcp42-server/Makefile
===================================================================
--- net/isc-dhcp42-server/Makefile
+++ net/isc-dhcp42-server/Makefile
@@ -140,9 +140,6 @@
${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
Index: net/isc-dhcp43-server/Makefile
===================================================================
--- net/isc-dhcp43-server/Makefile
+++ net/isc-dhcp43-server/Makefile
@@ -140,9 +140,6 @@
${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
Index: net/libpcap/files/patch-Makefile.in
===================================================================
--- net/libpcap/files/patch-Makefile.in
+++ 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
Index: print/paps/Makefile
===================================================================
--- print/paps/Makefile
+++ print/paps/Makefile
@@ -17,7 +17,4 @@
USE_GNOME= pango
USES= pkgconfig
-post-patch:
- @${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/src/Makefile.in
-
.include <bsd.port.mk>
Index: security/logcheck/Makefile
===================================================================
--- security/logcheck/Makefile
+++ security/logcheck/Makefile
@@ -36,7 +36,6 @@
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 @@
@${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 @@
@${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>
Index: security/logcheck/pkg-plist
===================================================================
--- security/logcheck/pkg-plist
+++ 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
Index: sysutils/dateutils/files/patch-lib__Makefile.in
===================================================================
--- 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)
Index: textproc/syck/Makefile
===================================================================
--- textproc/syck/Makefile
+++ textproc/syck/Makefile
@@ -20,7 +20,4 @@
CFLAGS+= -fPIC
-post-patch:
- @${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/lib/Makefile.in
-
.include <bsd.port.mk>
Index: www/vdradmin-am/Makefile
===================================================================
--- www/vdradmin-am/Makefile
+++ www/vdradmin-am/Makefile
@@ -65,7 +65,7 @@
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} \
Index: x11-toolkits/blt/files/patch-generic_Makefile.in
===================================================================
--- x11-toolkits/blt/files/patch-generic_Makefile.in
+++ 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)
Index: x11-toolkits/plib/Makefile
===================================================================
--- x11-toolkits/plib/Makefile
+++ x11-toolkits/plib/Makefile
@@ -25,7 +25,6 @@
@${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:

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 25, 7:12 AM (7 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27243334
Default Alt Text
D703.id1300.diff (44 KB)

Event Timeline