svn commit: r308238 - in stable/11: etc gnu/lib/libgcc share/examples usr.bin/calendar

[Glen Barber]

Author: gjb
Date: Thu Nov  3 00:34:37 2016
New Revision: 308238
URL: https://svnweb.freebsd.org/changeset/base/308238

Log:
  MFC r308148, r308150, r308156:
  
   r308148:
    Fix packaging calendar(1) files.
  
   r308150:
    Fix packaging /usr/share/examples/etc.
  
   r308156:
    Fix packaging /usr/lib{,32}/libgcc_eh{,_p}.a.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/etc/Makefile
  stable/11/gnu/lib/libgcc/Makefile
  stable/11/share/examples/Makefile
  stable/11/usr.bin/calendar/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/Makefile
==============================================================================
--- stable/11/etc/Makefile	Thu Nov  3 00:26:58 2016	(r308237)
+++ stable/11/etc/Makefile	Thu Nov  3 00:34:37 2016	(r308238)
@@ -459,7 +459,7 @@ distrib-dirs: ${MTREES:N/*} distrib-clea
 .endif
 
 etc-examples-install: ${META_DEPS}
-	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
+	cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${BIN1} ${BIN2} nsmb.conf opieaccess \
 	    ${DESTDIR}${SHAREDIR}/examples/etc
 

Modified: stable/11/gnu/lib/libgcc/Makefile
==============================================================================
--- stable/11/gnu/lib/libgcc/Makefile	Thu Nov  3 00:26:58 2016	(r308237)
+++ stable/11/gnu/lib/libgcc/Makefile	Thu Nov  3 00:34:37 2016	(r308238)
@@ -393,11 +393,11 @@ _libinstall: _lib-eh-install
 
 _lib-eh-install:
 .if ${MK_INSTALLLIB} != "no"
-	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	${INSTALL} ${TAG_ARGS} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 		${_INSTALLFLAGS} libgcc_eh.a ${DESTDIR}${LIBDIR}
 .endif
 .if ${MK_PROFILE} != "no"
-	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	${INSTALL} ${TAG_ARGS} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 		${_INSTALLFLAGS} libgcc_eh_p.a ${DESTDIR}${LIBDIR}
 .endif
 

Modified: stable/11/share/examples/Makefile
==============================================================================
--- stable/11/share/examples/Makefile	Thu Nov  3 00:26:58 2016	(r308237)
+++ stable/11/share/examples/Makefile	Thu Nov  3 00:34:37 2016	(r308238)
@@ -250,7 +250,7 @@ copies:
 symlinks:
 .for i in ${LDIRS}
 	rm -rf ${DESTDIR}${BINDIR}/$i
-	ln -s ${.CURDIR}/$i ${DESTDIR}${BINDIR}/$i
+	${INSTALL} ${TAG_ARGS} -l s ${.CURDIR}/$i ${DESTDIR}${BINDIR}/$i
 .endfor
 
 etc-examples:

Modified: stable/11/usr.bin/calendar/Makefile
==============================================================================
--- stable/11/usr.bin/calendar/Makefile	Thu Nov  3 00:26:58 2016	(r308237)
+++ stable/11/usr.bin/calendar/Makefile	Thu Nov  3 00:34:37 2016	(r308238)
@@ -15,20 +15,22 @@ FR_LINKS=       fr_FR.ISO8859-15
 TEXTMODE?=	444
 
 beforeinstall:
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
+	${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
 	    ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
 .for lang in ${INTER}
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
+	${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
 		${.CURDIR}/calendars/${lang}/calendar.* \
 		${DESTDIR}${SHAREDIR}/calendar/${lang} 
 .endfor
 .for link in ${DE_LINKS}
 	rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link}
-	ln -s de_DE.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link}
+	${INSTALL} ${TAG_ARGS} -l s de_DE.ISO8859-1 \
+	    ${DESTDIR}${SHAREDIR}/calendar/${link}
 .endfor
 .for link in ${FR_LINKS}
 	rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link}
-	ln -s fr_FR.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link}
+	${INSTALL} ${TAG_ARGS} -l s fr_FR.ISO8859-1 \
+	    ${DESTDIR}${SHAREDIR}/calendar/${link}
 .endfor
 
 .if ${MK_TESTS} != "no"