| 1 |
commit: 8dbcd7fb3e5bb2de5278a7a07faa7cc4c944d64c |
| 2 |
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
| 3 |
AuthorDate: Fri Aug 30 11:53:12 2013 +0000 |
| 4 |
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com> |
| 5 |
CommitDate: Fri Aug 30 11:53:12 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=8dbcd7fb |
| 7 |
|
| 8 |
freebsd-mk-defs-9999_p255023: added freebsd-mk-defs-9999-gentoo.patch |
| 9 |
|
| 10 |
--- |
| 11 |
sys-freebsd/freebsd-mk-defs/Manifest | 3 +- |
| 12 |
.../files/freebsd-mk-defs-9999-gentoo.patch | 352 +++++++++++++++++++++ |
| 13 |
.../freebsd-mk-defs-9999_p255023.ebuild | 2 +- |
| 14 |
3 files changed, 355 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest |
| 17 |
index 47fb920..672a7fb 100644 |
| 18 |
--- a/sys-freebsd/freebsd-mk-defs/Manifest |
| 19 |
+++ b/sys-freebsd/freebsd-mk-defs/Manifest |
| 20 |
@@ -4,5 +4,6 @@ AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f |
| 21 |
AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6 |
| 22 |
AUX freebsd-mk-defs-9.2-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd |
| 23 |
AUX freebsd-mk-defs-9.2-gnu.patch 2242 SHA256 95305f335a360549703c73056898e778640c30a60c9f6b104709e7fc0cf75926 SHA512 a5b5c341972bee204d2a5b1f59cefda03aa48fdb7c7c713ceb9d4477e266aecfd137c2101988c48c73c527652ff0828e0a60b8c474904b146238c640c25d7416 WHIRLPOOL 7f7a45ad858a0b1c0cb099cedef05772fb90a752567ec778ec6f379f04e2cc86a8d4756c5c70d18685d42346fe43088622977eced076cf2c5bdbfb90fbb53362 |
| 24 |
+AUX freebsd-mk-defs-9999-gentoo.patch 12163 SHA256 bcbb924cf7ff0a85ad9458f7943ec311789a4eb2ca8fde1d937ef4e11c5bdc9e SHA512 1a1a483ddf58a2c90bd86251b3a998af3460aac485261491f2541daa92432d7c9a9f1efd8655e0603eab1ce03c9708ba40f50b10a9deb02526c97fa2730891db WHIRLPOOL 4e4546e1d4dc5b8936b74fa0f3b591313501576e34b0fbf44fe729389e2905191f04cc68e162a9459dab83c4ebc44f4a090e5ee631c9485595a3e4f28fb49b8b |
| 25 |
EBUILD freebsd-mk-defs-9.9999.ebuild 770 SHA256 b4fe90bb30dbb83d4d91b873851a7ee33d91268119bcbc9db097aa9b590e9f4c SHA512 1bee20b5d49ecefafc8403161b78bb53bcbd093445752a6583d42f784b012faeb49a2ec909b611904f85e3f57be7f3289dac3726cf3c8b469ce0adfe2607e9cc WHIRLPOOL 2540a7f00794a99f7b2deeab6954f21cbca69d372854c7c9998da460f90cf363f5246235391a245897d9e58c816989ce320573d444ff153f9b3f99153aa86cc3 |
| 26 |
-EBUILD freebsd-mk-defs-9999_p255023.ebuild 770 SHA256 b4fe90bb30dbb83d4d91b873851a7ee33d91268119bcbc9db097aa9b590e9f4c SHA512 1bee20b5d49ecefafc8403161b78bb53bcbd093445752a6583d42f784b012faeb49a2ec909b611904f85e3f57be7f3289dac3726cf3c8b469ce0adfe2607e9cc WHIRLPOOL 2540a7f00794a99f7b2deeab6954f21cbca69d372854c7c9998da460f90cf363f5246235391a245897d9e58c816989ce320573d444ff153f9b3f99153aa86cc3 |
| 27 |
+EBUILD freebsd-mk-defs-9999_p255023.ebuild 771 SHA256 9946d51246a9240b8fb20913c2d5ba51d24329f6ea4ec9f5eba818dd1196294e SHA512 20c1ac8db64b7b8633ee1f606bfa443b83f2077b57d165ee810170fe5e980e45453eab53302a84d262c2075ecce0809834366846ba697286a09919f69d91126e WHIRLPOOL a593e21bdb8358a88430da985542cecf5bc59e88f218fcc4995bb603e752360d1b06ddd37334e1ad32398a2b82248be9ce5b36d90f824c54d6bf100e5b5cc8f5 |
| 28 |
|
| 29 |
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch |
| 30 |
new file mode 100644 |
| 31 |
index 0000000..27d3b06 |
| 32 |
--- /dev/null |
| 33 |
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch |
| 34 |
@@ -0,0 +1,352 @@ |
| 35 |
+tested revision 255023. |
| 36 |
+ |
| 37 |
+diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk |
| 38 |
+index 2d648de..e456a4b 100644 |
| 39 |
+--- a/share/mk/bsd.compiler.mk |
| 40 |
++++ b/share/mk/bsd.compiler.mk |
| 41 |
+@@ -1,7 +1,7 @@ |
| 42 |
+ # $FreeBSD$ |
| 43 |
+ |
| 44 |
+ .if !defined(COMPILER_TYPE) |
| 45 |
+-. if ${CC:T:Mgcc*} |
| 46 |
++. if ${CC:T:M*gcc*} |
| 47 |
+ COMPILER_TYPE:= gcc |
| 48 |
+ . elif ${CC:T:Mclang} |
| 49 |
+ COMPILER_TYPE:= clang |
| 50 |
+diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk |
| 51 |
+index 49b2d9b..c2a8c5c 100644 |
| 52 |
+--- a/share/mk/bsd.doc.mk |
| 53 |
++++ b/share/mk/bsd.doc.mk |
| 54 |
+@@ -135,10 +135,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \ |
| 55 |
+ realinstall: |
| 56 |
+ .for _dev in ${PRINTERDEVICE:Mhtml} |
| 57 |
+ cd ${SRCDIR}; \ |
| 58 |
++ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
| 59 |
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 60 |
+ ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} |
| 61 |
+ .endfor |
| 62 |
+ .for _dev in ${PRINTERDEVICE:Nhtml} |
| 63 |
++ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
| 64 |
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 65 |
+ ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} |
| 66 |
+ .endfor |
| 67 |
+diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk |
| 68 |
+index 240f958..67f0cf9 100644 |
| 69 |
+--- a/share/mk/bsd.files.mk |
| 70 |
++++ b/share/mk/bsd.files.mk |
| 71 |
+@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?= ${file:T} |
| 72 |
+ .endif |
| 73 |
+ installfiles: _${group}INS_${file:T} |
| 74 |
+ _${group}INS_${file:T}: ${file} |
| 75 |
++ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
| 76 |
+ ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ |
| 77 |
+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 78 |
+ ${.ALLSRC} \ |
| 79 |
+@@ -51,10 +52,12 @@ _${group}FILES+= ${file} |
| 80 |
+ installfiles: _${group}INS |
| 81 |
+ _${group}INS: ${_${group}FILES} |
| 82 |
+ .if defined(${group}NAME) |
| 83 |
++ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 84 |
+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ |
| 85 |
+ -m ${${group}MODE} ${.ALLSRC} \ |
| 86 |
+ ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 87 |
+ .else |
| 88 |
++ ${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 89 |
+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ |
| 90 |
+ -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} |
| 91 |
+ .endif |
| 92 |
+diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk |
| 93 |
+index 74c378b..7d2c7a0 100644 |
| 94 |
+--- a/share/mk/bsd.incs.mk |
| 95 |
++++ b/share/mk/bsd.incs.mk |
| 96 |
+@@ -41,6 +41,9 @@ ${group}NAME_${header:T}?= ${header:T} |
| 97 |
+ .endif |
| 98 |
+ installincludes: _${group}INS_${header:T} |
| 99 |
+ _${group}INS_${header:T}: ${header} |
| 100 |
++ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ |
| 101 |
++ -g ${${group}GRP_${.ALLSRC:T}} \ |
| 102 |
++ ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
| 103 |
+ ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ |
| 104 |
+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 105 |
+ ${.ALLSRC} \ |
| 106 |
+@@ -53,9 +56,13 @@ _${group}INCS+= ${header} |
| 107 |
+ installincludes: _${group}INS |
| 108 |
+ _${group}INS: ${_${group}INCS} |
| 109 |
+ .if defined(${group}NAME) |
| 110 |
++ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
| 111 |
++ ${DESTDIR}${${group}DIR} |
| 112 |
+ ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 113 |
+ ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 114 |
+ .else |
| 115 |
++ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
| 116 |
++ ${DESTDIR}${${group}DIR} |
| 117 |
+ ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 118 |
+ ${.ALLSRC} ${DESTDIR}${${group}DIR} |
| 119 |
+ .endif |
| 120 |
+diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk |
| 121 |
+index c54b435..d283240 100644 |
| 122 |
+--- a/share/mk/bsd.info.mk |
| 123 |
++++ b/share/mk/bsd.info.mk |
| 124 |
+@@ -83,6 +83,7 @@ INFO2HTML?= info2html |
| 125 |
+ TEX?= tex |
| 126 |
+ DVIPS?= dvips |
| 127 |
+ DVIPS2ASCII?= dvips2ascii |
| 128 |
++INSTALL?= install |
| 129 |
+ |
| 130 |
+ .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html |
| 131 |
+ |
| 132 |
+@@ -144,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} |
| 133 |
+ INSTALLINFODIRS+= ${x:S/$/-install/} |
| 134 |
+ ${x:S/$/-install/}: |
| 135 |
+ .if !empty(.MAKEFLAGS:M-j) |
| 136 |
++ ${INSTALL} -d ${DESTDIR}${INFODIR} |
| 137 |
+ lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ |
| 138 |
+ ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
| 139 |
+- --defsection=${INFOSECTION} \ |
| 140 |
+- --defentry=${INFOENTRY_${x}} \ |
| 141 |
++ --section=${INFOSECTION} \ |
| 142 |
++ --entry=${INFOENTRY_${x}} \ |
| 143 |
+ ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 144 |
+ .else |
| 145 |
++ ${INSTALL} -d ${DESTDIR}${INFODIR} |
| 146 |
+ ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
| 147 |
+- --defsection=${INFOSECTION} \ |
| 148 |
+- --defentry=${INFOENTRY_${x}} \ |
| 149 |
++ --section=${INFOSECTION} \ |
| 150 |
++ --entry=${INFOENTRY_${x}} \ |
| 151 |
+ ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 152 |
+ .endif |
| 153 |
+ .endfor |
| 154 |
+diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk |
| 155 |
+index 66d0a29..3ac8706 100644 |
| 156 |
+--- a/share/mk/bsd.lib.mk |
| 157 |
++++ b/share/mk/bsd.lib.mk |
| 158 |
+@@ -39,8 +39,6 @@ CFLAGS+= ${DEBUG_FLAGS} |
| 159 |
+ .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" |
| 160 |
+ CTFFLAGS+= -g |
| 161 |
+ .endif |
| 162 |
+-.else |
| 163 |
+-STRIP?= -s |
| 164 |
+ .endif |
| 165 |
+ |
| 166 |
+ .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \ |
| 167 |
+@@ -290,14 +288,17 @@ realinstall: _libinstall |
| 168 |
+ .ORDER: beforeinstall _libinstall |
| 169 |
+ _libinstall: |
| 170 |
+ .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" |
| 171 |
++ ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 172 |
+ ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 173 |
+ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} |
| 174 |
+ .endif |
| 175 |
+ .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) |
| 176 |
++ ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 177 |
+ ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 178 |
+ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} |
| 179 |
+ .endif |
| 180 |
+ .if defined(SHLIB_NAME) |
| 181 |
++ ${INSTALL} -d ${DESTDIR}${SHLIBDIR} |
| 182 |
+ ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 183 |
+ ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ |
| 184 |
+ ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} |
| 185 |
+@@ -351,10 +352,12 @@ _libinstall: |
| 186 |
+ .endif # SHLIB_LINK |
| 187 |
+ .endif # SHIB_NAME |
| 188 |
+ .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" |
| 189 |
++ ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 190 |
+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 191 |
+ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR} |
| 192 |
+ .endif |
| 193 |
+ .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) |
| 194 |
++ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR} |
| 195 |
+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 196 |
+ ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} |
| 197 |
+ .endif |
| 198 |
+diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk |
| 199 |
+index f78a656..59e3511 100644 |
| 200 |
+--- a/share/mk/bsd.libnames.mk |
| 201 |
++++ b/share/mk/bsd.libnames.mk |
| 202 |
+@@ -52,7 +52,7 @@ LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.a |
| 203 |
+ LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a |
| 204 |
+ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a |
| 205 |
+ LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a |
| 206 |
+-LIBFL?= "don't use LIBFL, use LIBL" |
| 207 |
++LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a |
| 208 |
+ LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a |
| 209 |
+ LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a |
| 210 |
+ LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a |
| 211 |
+@@ -85,7 +85,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a |
| 212 |
+ LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a |
| 213 |
+ LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a |
| 214 |
+ LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a |
| 215 |
+-LIBL?= ${DESTDIR}${LIBDIR}/libl.a |
| 216 |
++LIBL?= ${DESTDIR}${LIBDIR}/libfl.a |
| 217 |
+ .if ${MK_LDNS} != "no" |
| 218 |
+ LIBLDNS?= ${DESTDIR}${LIBDIR}/libldns.a |
| 219 |
+ .endif |
| 220 |
+diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk |
| 221 |
+index 1e4d57e..fcb81fe 100644 |
| 222 |
+--- a/share/mk/bsd.links.mk |
| 223 |
++++ b/share/mk/bsd.links.mk |
| 224 |
+@@ -15,6 +15,8 @@ _installlinks: |
| 225 |
+ t=${DESTDIR}$$1; \ |
| 226 |
+ shift; \ |
| 227 |
+ ${ECHO} $$t -\> $$l; \ |
| 228 |
++ d=`dirname $$t`; \ |
| 229 |
++ test -d $$d || mkdir $$d; \ |
| 230 |
+ ${INSTALL_LINK} $$l $$t; \ |
| 231 |
+ done; true |
| 232 |
+ .endif |
| 233 |
+@@ -26,6 +28,8 @@ _installlinks: |
| 234 |
+ t=${DESTDIR}$$1; \ |
| 235 |
+ shift; \ |
| 236 |
+ ${ECHO} $$t -\> $$l; \ |
| 237 |
++ d=`dirname $$t`; \ |
| 238 |
++ test -d $$d || mkdir $$d; \ |
| 239 |
+ ${INSTALL_SYMLINK} $$l $$t; \ |
| 240 |
+ done; true |
| 241 |
+ .endif |
| 242 |
+diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk |
| 243 |
+index 6445ba3..fabffa2 100644 |
| 244 |
+--- a/share/mk/bsd.man.mk |
| 245 |
++++ b/share/mk/bsd.man.mk |
| 246 |
+@@ -165,9 +165,11 @@ _maninstall: ${MAN} |
| 247 |
+ .if defined(NO_MANCOMPRESS) |
| 248 |
+ .if defined(MANFILTER) |
| 249 |
+ .for __page in ${MAN} |
| 250 |
++ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} |
| 251 |
+ ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ |
| 252 |
+ ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} |
| 253 |
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 254 |
++ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} |
| 255 |
+ ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ |
| 256 |
+ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} |
| 257 |
+ .endif |
| 258 |
+@@ -181,11 +183,14 @@ _maninstall: ${MAN} |
| 259 |
+ esac; \ |
| 260 |
+ page=$$1; shift; sect=$$1; shift; \ |
| 261 |
+ d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ |
| 262 |
++ ${ECHO} ${INSTALL} -d $${d}; \ |
| 263 |
++ ${INSTALL} -d $${d}; \ |
| 264 |
+ ${ECHO} ${MINSTALL} $${page} $${d}; \ |
| 265 |
+ ${MINSTALL} $${page} $${d}; \ |
| 266 |
+ done |
| 267 |
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 268 |
+ .for __page in ${MAN} |
| 269 |
++ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} |
| 270 |
+ ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ |
| 271 |
+ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} |
| 272 |
+ .endfor |
| 273 |
+@@ -193,9 +198,11 @@ _maninstall: ${MAN} |
| 274 |
+ .endif |
| 275 |
+ .else |
| 276 |
+ .for __page in ${MAN} |
| 277 |
++ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} |
| 278 |
+ ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ |
| 279 |
+ ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} |
| 280 |
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 281 |
++ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT} |
| 282 |
+ ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ |
| 283 |
+ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} |
| 284 |
+ .endif |
| 285 |
+diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk |
| 286 |
+index 48093eb..69f56bc 100644 |
| 287 |
+--- a/share/mk/bsd.nls.mk |
| 288 |
++++ b/share/mk/bsd.nls.mk |
| 289 |
+@@ -62,7 +62,8 @@ NLSDIR?= ${SHAREDIR}/nls |
| 290 |
+ # installation rules |
| 291 |
+ # |
| 292 |
+ .for file in ${NLS} |
| 293 |
+-NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat |
| 294 |
++NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/ |
| 295 |
++NLSNAME_${file:T}= ${NLSNAME}.cat |
| 296 |
+ .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) |
| 297 |
+ NLSLINKS+= ${file:R} |
| 298 |
+ .endif |
| 299 |
+diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk |
| 300 |
+index da758d5..7461f68 100644 |
| 301 |
+--- a/share/mk/bsd.own.mk |
| 302 |
++++ b/share/mk/bsd.own.mk |
| 303 |
+@@ -199,9 +199,6 @@ INSTALL_LINK?= ${INSTALL} ${HRDLINK} |
| 304 |
+ INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} |
| 305 |
+ |
| 306 |
+ # Common variables |
| 307 |
+-.if !defined(DEBUG_FLAGS) |
| 308 |
+-STRIP?= -s |
| 309 |
+-.endif |
| 310 |
+ |
| 311 |
+ COMPRESS_CMD?= gzip -cn |
| 312 |
+ COMPRESS_EXT?= .gz |
| 313 |
+diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk |
| 314 |
+index f4546dc..372bb98 100644 |
| 315 |
+--- a/share/mk/bsd.prog.mk |
| 316 |
++++ b/share/mk/bsd.prog.mk |
| 317 |
+@@ -44,10 +44,6 @@ CTFFLAGS+= -g |
| 318 |
+ .endif |
| 319 |
+ .endif |
| 320 |
+ |
| 321 |
+-.if !defined(DEBUG_FLAGS) |
| 322 |
+-STRIP?= -s |
| 323 |
+-.endif |
| 324 |
+- |
| 325 |
+ .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") |
| 326 |
+ LDFLAGS+= -static |
| 327 |
+ .endif |
| 328 |
+@@ -197,6 +193,7 @@ realinstall: _proginstall |
| 329 |
+ .ORDER: beforeinstall _proginstall |
| 330 |
+ _proginstall: |
| 331 |
+ .if defined(PROG) |
| 332 |
++ ${INSTALL} -d ${DESTDIR}${BINDIR} |
| 333 |
+ ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 334 |
+ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} |
| 335 |
+ .if ${MK_DEBUG_FILES} != "no" |
| 336 |
+@@ -230,6 +227,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} |
| 337 |
+ SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} |
| 338 |
+ _scriptsinstall: _SCRIPTSINS_${script:T} |
| 339 |
+ _SCRIPTSINS_${script:T}: ${script} |
| 340 |
++ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} |
| 341 |
+ ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ |
| 342 |
+ -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ |
| 343 |
+ ${.ALLSRC} \ |
| 344 |
+diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk |
| 345 |
+index 72dfa61..4f21af4 100644 |
| 346 |
+--- a/share/mk/bsd.sys.mk |
| 347 |
++++ b/share/mk/bsd.sys.mk |
| 348 |
+@@ -30,10 +30,6 @@ CFLAGS+= -std=${CSTD} |
| 349 |
+ .if defined(WARNS) |
| 350 |
+ .if ${WARNS} >= 1 |
| 351 |
+ CWARNFLAGS+= -Wsystem-headers |
| 352 |
+-.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \ |
| 353 |
+- || !defined(NO_WERROR.clang)) |
| 354 |
+-CWARNFLAGS+= -Werror |
| 355 |
+-.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) |
| 356 |
+ .endif # WARNS >= 1 |
| 357 |
+ .if ${WARNS} >= 2 |
| 358 |
+ CWARNFLAGS+= -Wall -Wno-format-y2k |
| 359 |
+@@ -99,10 +95,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args |
| 360 |
+ CWARNFLAGS+= -Wno-format-nonliteral |
| 361 |
+ .endif # WARNS <= 3 |
| 362 |
+ .endif # CLANG |
| 363 |
+-.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \ |
| 364 |
+- || !defined(NO_WERROR.clang)) |
| 365 |
+-CWARNFLAGS+= -Werror |
| 366 |
+-.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) |
| 367 |
+ .endif # WFORMAT > 0 |
| 368 |
+ .endif # WFORMAT |
| 369 |
+ .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang)) |
| 370 |
+diff --git a/share/mk/sys.mk b/share/mk/sys.mk |
| 371 |
+index eb9f2ca..09ad4cf 100644 |
| 372 |
+--- a/share/mk/sys.mk |
| 373 |
++++ b/share/mk/sys.mk |
| 374 |
+@@ -321,12 +321,6 @@ YFLAGS ?= -d |
| 375 |
+ rm -f ${.PREFIX}.tmp.c |
| 376 |
+ ${CTFCONVERT_CMD} |
| 377 |
+ |
| 378 |
+-# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. |
| 379 |
+-__MAKE_CONF?=/etc/make.conf |
| 380 |
+-.if exists(${__MAKE_CONF}) |
| 381 |
+-.include "${__MAKE_CONF}" |
| 382 |
+-.endif |
| 383 |
+- |
| 384 |
+ .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) |
| 385 |
+ SHELL= ${__MAKE_SHELL} |
| 386 |
+ .SHELL: path=${__MAKE_SHELL} |
| 387 |
|
| 388 |
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9999_p255023.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9999_p255023.ebuild |
| 389 |
index 2535487..62ceb58 100644 |
| 390 |
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9999_p255023.ebuild |
| 391 |
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9999_p255023.ebuild |
| 392 |
@@ -24,7 +24,7 @@ RESTRICT="strip" |
| 393 |
S="${WORKDIR}/share/mk" |
| 394 |
|
| 395 |
src_prepare() { |
| 396 |
- epatch "${FILESDIR}/${PN}-9.2-gentoo.patch" |
| 397 |
+ epatch "${FILESDIR}/${PN}-9999-gentoo.patch" |
| 398 |
use userland_GNU && epatch "${FILESDIR}/${PN}-9.2-gnu.patch" |
| 399 |
} |
Archives