mgorny      15/03/08 14:01:57

  Added:                freebsd-mk-defs-10.0-gentoo.patch
                        freebsd-mk-defs-10.0-gnu.patch
  Log:
  Add FreeBSD 10.1 ebuilds, 
https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/46 by nigoro.
  
  (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  Changes    Path
1.1                  
sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gentoo.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gentoo.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gentoo.patch?rev=1.1&content-type=text/plain

Index: freebsd-mk-defs-10.0-gentoo.patch
===================================================================
tested revision 255489

diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
index 2d648de..e456a4b 100644
--- a/share/mk/bsd.compiler.mk
+++ b/share/mk/bsd.compiler.mk
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .if !defined(COMPILER_TYPE)
-. if ${CC:T:Mgcc*}
+. if ${CC:T:M*gcc*}
 COMPILER_TYPE:=        gcc  
 . elif ${CC:T:Mclang}
 COMPILER_TYPE:=        clang
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 49b2d9b..c2a8c5c 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -135,10 +135,12 @@ CLEANFILES+=      ${DOC}.ascii 
${DOC}.ascii${DCOMPRESS_EXT} \
 realinstall:
 .for _dev in ${PRINTERDEVICE:Mhtml}
        cd ${SRCDIR}; \
+           ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
            ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
            ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
 .endfor
 .for _dev in ${PRINTERDEVICE:Nhtml}
+       ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
        ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
            ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
 .endfor
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index 240f958..67f0cf9 100644
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?=      ${file:T}
 .endif
 installfiles: _${group}INS_${file:T}
 _${group}INS_${file:T}: ${file}
+       ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
        ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
            -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
            ${.ALLSRC} \
@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
 installfiles: _${group}INS
 _${group}INS: ${_${group}FILES}
 .if defined(${group}NAME)
+       ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
        ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
            -m ${${group}MODE} ${.ALLSRC} \
            ${DESTDIR}${${group}DIR}/${${group}NAME}
 .else
+       ${INSTALL} -d ${DESTDIR}${${group}DIR}
        ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
            -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
 .endif
diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
index 74c378b..7d2c7a0 100644
--- a/share/mk/bsd.incs.mk
+++ b/share/mk/bsd.incs.mk
@@ -41,6 +41,9 @@ ${group}NAME_${header:T}?=    ${header:T}
 .endif
 installincludes: _${group}INS_${header:T}
 _${group}INS_${header:T}: ${header}
+       ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
+                -g ${${group}GRP_${.ALLSRC:T}} \
+                ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
        ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
            -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
            ${.ALLSRC} \
@@ -53,9 +56,13 @@ _${group}INCS+= ${header}
 installincludes: _${group}INS
 _${group}INS: ${_${group}INCS}
 .if defined(${group}NAME)
+       ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
+               ${DESTDIR}${${group}DIR}
        ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
            ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
 .else
+       ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
+               ${DESTDIR}${${group}DIR}
        ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
            ${.ALLSRC} ${DESTDIR}${${group}DIR}
 .endif
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index c54b435..d283240 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -83,6 +83,7 @@ INFO2HTML?=   info2html
 TEX?=          tex
 DVIPS?=                dvips
 DVIPS2ASCII?=  dvips2ascii
+INSTALL?=      install
 
 .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
 
@@ -144,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}:       ${x}
 INSTALLINFODIRS+= ${x:S/$/-install/}
 ${x:S/$/-install/}:
 .if !empty(.MAKEFLAGS:M-j)
+       ${INSTALL} -d ${DESTDIR}${INFODIR}
        lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
        ${INSTALLINFO} ${INSTALLINFOFLAGS} \
-           --defsection=${INFOSECTION} \
-           --defentry=${INFOENTRY_${x}} \
+           --section=${INFOSECTION} \
+           --entry=${INFOENTRY_${x}} \
            ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
 .else
+       ${INSTALL} -d ${DESTDIR}${INFODIR}
        ${INSTALLINFO} ${INSTALLINFOFLAGS} \
-           --defsection=${INFOSECTION} \
-           --defentry=${INFOENTRY_${x}} \
+           --section=${INFOSECTION} \
+           --entry=${INFOENTRY_${x}} \
            ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
 .endif
 .endfor
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index bb3db64..dbb9bf4 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -39,8 +39,6 @@ CFLAGS+= ${DEBUG_FLAGS}
 .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
 CTFFLAGS+= -g
 .endif
-.else
-STRIP?=        -s
 .endif
 
 .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
@@ -302,14 +300,17 @@ realinstall: _libinstall
 .ORDER: beforeinstall _libinstall
 _libinstall:
 .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
+       ${INSTALL} -d ${DESTDIR}${_LIBDIR}
        ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
            ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
 .endif
 .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
+       ${INSTALL} -d ${DESTDIR}${_LIBDIR}
        ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
            ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
 .endif
 .if defined(SHLIB_NAME)
+       ${INSTALL} -d ${DESTDIR}${_SHLIBDIR}
        ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
            ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
            ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}
@@ -363,10 +364,12 @@ _libinstall:
 .endif # SHLIB_LINK
 .endif # SHIB_NAME
 .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && 
${MK_TOOLCHAIN} != "no"
+       ${INSTALL} -d ${DESTDIR}${_LIBDIR}
        ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
            ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}
 .endif
 .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
+       ${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
        ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
            ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
 .endif
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 00d38ff..86792f4 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -53,7 +53,7 @@ LIBEDIT?=     ${DESTDIR}${LIBDIR}/libedit.a
 LIBELF?=       ${DESTDIR}${LIBDIR}/libelf.a
 LIBEXECINFO?=  ${DESTDIR}${LIBDIR}/libexecinfo.a
 LIBFETCH?=     ${DESTDIR}${LIBDIR}/libfetch.a
-LIBFL?=                "don't use LIBFL, use LIBL"
+LIBFL?=                ${DESTDIR}${LIBDIR}/libfl.a
 LIBFORM?=      ${DESTDIR}${LIBDIR}/libform.a
 LIBG2C?=       ${DESTDIR}${LIBDIR}/libg2c.a
 LIBGCC?=       ${DESTDIR}${LIBDIR}/libgcc.a
@@ -88,7 +88,7 @@ LIBKEYCAP?=   ${DESTDIR}${LIBDIR}/libkeycap.a
 LIBKICONV?=    ${DESTDIR}${LIBDIR}/libkiconv.a
 LIBKRB5?=      ${DESTDIR}${LIBDIR}/libkrb5.a
 LIBKVM?=       ${DESTDIR}${LIBDIR}/libkvm.a
-LIBL?=         ${DESTDIR}${LIBDIR}/libl.a
+LIBL?=         ${DESTDIR}${LIBDIR}/libfl.a
 .if ${MK_LDNS} != "no"
 LIBLDNS?=      ${DESTDIR}${LIBPRIVATEDIR}/libldns.a
 .endif
diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
index 1e4d57e..fcb81fe 100644
--- a/share/mk/bsd.links.mk
+++ b/share/mk/bsd.links.mk
@@ -15,6 +15,8 @@ _installlinks:
                t=${DESTDIR}$$1; \
                shift; \
                ${ECHO} $$t -\> $$l; \
+               d=`dirname $$t`; \
+               test -d $$d || mkdir $$d; \
                ${INSTALL_LINK} $$l $$t; \
        done; true
 .endif
@@ -26,6 +28,8 @@ _installlinks:
                t=${DESTDIR}$$1; \
                shift; \
                ${ECHO} $$t -\> $$l; \
+               d=`dirname $$t`; \
+               test -d $$d || mkdir $$d; \
                ${INSTALL_SYMLINK} $$l $$t; \
        done; true
 .endif
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 6445ba3..fabffa2 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -165,9 +165,11 @@ _maninstall: ${MAN}
 .if defined(NO_MANCOMPRESS)
 .if defined(MANFILTER)
 .for __page in ${MAN}
+       ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
        ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
                ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
+       ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
        ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
                ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
 .endif
@@ -181,11 +183,14 @@ _maninstall: ${MAN}
                esac; \
                page=$$1; shift; sect=$$1; shift; \
                d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
+               ${ECHO} ${INSTALL} -d $${d}; \
+               ${INSTALL} -d $${d}; \
                ${ECHO} ${MINSTALL} $${page} $${d}; \
                ${MINSTALL} $${page} $${d}; \
        done
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
 .for __page in ${MAN}
+       ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
        ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
                ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
 .endfor
@@ -193,9 +198,11 @@ _maninstall: ${MAN}
 .endif
 .else
 .for __page in ${MAN}
+       ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
        ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
                ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
+       ${INSTALL} -d 
${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}
        ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
                
${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
 .endif
diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
index 48093eb..69f56bc 100644
--- a/share/mk/bsd.nls.mk
+++ b/share/mk/bsd.nls.mk
@@ -62,7 +62,8 @@ NLSDIR?=      ${SHAREDIR}/nls
 # installation rules
 #
 .for file in ${NLS}
-NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
+NLSNAME_${file:T}= ${NLSNAME}.cat
 .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
 NLSLINKS+=     ${file:R}
 .endif
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 8f7f0b9..189ccec 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -202,9 +202,6 @@ INSTALL_LINK?=              ${INSTALL} ${HRDLINK}
 INSTALL_SYMLINK?=      ${INSTALL} ${SYMLINK}
 
 # Common variables
-.if !defined(DEBUG_FLAGS)
-STRIP?=                -s
-.endif
 
 COMPRESS_CMD?= gzip -cn
 COMPRESS_EXT?= .gz
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 22ddfb5..f6a4939 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -44,10 +44,6 @@ CTFFLAGS+= -g
 .endif
 .endif
 
-.if !defined(DEBUG_FLAGS)
-STRIP?=        -s
-.endif
-
 .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
 LDFLAGS+= -static
 .endif
@@ -201,6 +197,7 @@ realinstall: _proginstall
 .ORDER: beforeinstall _proginstall
 _proginstall:
 .if defined(PROG)
+       ${INSTALL} -d ${DESTDIR}${BINDIR}
        ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
            ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
 .if ${MK_DEBUG_FILES} != "no"
@@ -234,6 +231,7 @@ SCRIPTSGRP_${script:T}?=    ${SCRIPTSGRP}
 SCRIPTSMODE_${script:T}?=      ${SCRIPTSMODE}
 _scriptsinstall: _SCRIPTSINS_${script:T}
 _SCRIPTSINS_${script:T}: ${script}
+       ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
        ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
            -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
            ${.ALLSRC} \
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 72dfa61..4f21af4 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -30,10 +30,6 @@ CFLAGS+=     -std=${CSTD}
 .if defined(WARNS)
 .if ${WARNS} >= 1
 CWARNFLAGS+=   -Wsystem-headers
-.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
-    || !defined(NO_WERROR.clang))
-CWARNFLAGS+=   -Werror
-.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
 .endif # WARNS >= 1
 .if ${WARNS} >= 2
 CWARNFLAGS+=   -Wall -Wno-format-y2k
@@ -99,10 +95,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args
 CWARNFLAGS+=   -Wno-format-nonliteral
 .endif # WARNS <= 3
 .endif # CLANG
-.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
-    || !defined(NO_WERROR.clang))
-CWARNFLAGS+=   -Werror
-.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
 .endif # WFORMAT > 0
 .endif # WFORMAT
 .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && 
defined(NO_WFORMAT.clang))
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index eb9f2ca..09ad4cf 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -321,12 +321,6 @@ YFLAGS             ?=      -d
        rm -f ${.PREFIX}.tmp.c
        ${CTFCONVERT_CMD}
 
-# FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
-__MAKE_CONF?=/etc/make.conf
-.if exists(${__MAKE_CONF})
-.include "${__MAKE_CONF}"
-.endif
-
 .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
 SHELL= ${__MAKE_SHELL}
 .SHELL: path=${__MAKE_SHELL}



1.1                  
sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gnu.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gnu.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gnu.patch?rev=1.1&content-type=text/plain

Index: freebsd-mk-defs-10.0-gnu.patch
===================================================================
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 0a33fdb..cd7ca2f 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -165,11 +165,7 @@ _LIBS=             lib${LIB}.a
 lib${LIB}.a: ${OBJS} ${STATICOBJS}
        @${ECHO} building static ${LIB} library
        @rm -f ${.TARGET}
-.if !defined(NM)
-       @${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` 
${ARADD}
-.else
-       @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | 
tsort -q` ${ARADD}
-.endif
+       @${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
        ${RANLIB} ${.TARGET}
 .endif
 
@@ -182,11 +178,7 @@ POBJS+=            ${OBJS:.o=.po} ${STATICOBJS:.o=.po}
 lib${LIB}_p.a: ${POBJS}
        @${ECHO} building profiled ${LIB} library
        @rm -f ${.TARGET}
-.if !defined(NM)
-       @${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
-.else
-       @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` 
${ARADD}
-.endif
+       @${AR} ${ARFLAGS} ${.TARGET} ${POBJS} ${ARADD}
        ${RANLIB} ${.TARGET}
 .endif
 
@@ -213,15 +205,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
 .if defined(SHLIB_LINK)
        @${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
 .endif
-.if !defined(NM)
        @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
            -o ${.TARGET} -Wl,-soname,${SONAME} \
-           `lorder ${SOBJS} | tsort -q` ${LDADD}
-.else
-       @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
-           -o ${.TARGET} -Wl,-soname,${SONAME} \
-           `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
-.endif
+           `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
 .if ${MK_CTF} != "no"
        ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
 .endif
@@ -279,13 +265,6 @@ _EXTRADEPEND:
 
 .if !target(install)
 
-.if defined(PRECIOUSLIB)
-.if !defined(NO_FSCHG)
-SHLINSTALLFLAGS+= -fschg
-.endif
-SHLINSTALLFLAGS+= -S
-.endif
-
 _INSTALLFLAGS:=        ${INSTALLFLAGS}
 .for ie in ${INSTALLFLAGS_EDIT}
 _INSTALLFLAGS:=        ${_INSTALLFLAGS${ie}}
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 02024e0..0f9010d 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -180,13 +180,6 @@ _EXTRADEPEND:
 
 .if !target(install)
 
-.if defined(PRECIOUSPROG)
-.if !defined(NO_FSCHG)
-INSTALLFLAGS+= -fschg
-.endif
-INSTALLFLAGS+= -S
-.endif
-
 _INSTALLFLAGS:=        ${INSTALLFLAGS}
 .for ie in ${INSTALLFLAGS_EDIT}
 _INSTALLFLAGS:=        ${_INSTALLFLAGS${ie}}




Reply via email to