You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
333 lines
11 KiB
333 lines
11 KiB
Index: share/mk/bsd.doc.mk
|
|
===================================================================
|
|
--- share/mk/bsd.doc.mk.orig
|
|
+++ share/mk/bsd.doc.mk
|
|
@@ -137,10 +137,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${
|
|
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
|
|
Index: share/mk/bsd.files.mk
|
|
===================================================================
|
|
--- share/mk/bsd.files.mk.orig
|
|
+++ 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}}/${${group}NAME_${.ALLSRC:T}:H}
|
|
${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
|
|
Index: share/mk/bsd.incs.mk
|
|
===================================================================
|
|
--- share/mk/bsd.incs.mk.orig
|
|
+++ share/mk/bsd.incs.mk
|
|
@@ -41,6 +41,10 @@ ${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}} -m ${${group}MODE_${.ALLSRC:T}} \
|
|
+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
|
|
${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
|
|
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
|
|
${.ALLSRC} \
|
|
@@ -53,9 +57,11 @@ _${group}INCS+= ${header}
|
|
installincludes: _${group}INS
|
|
_${group}INS: ${_${group}INCS}
|
|
.if defined(${group}NAME)
|
|
+ ${INSTALL} -d ${DESTDIR}${${group}DIR}
|
|
${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
|
${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
|
|
.else
|
|
+ ${INSTALL} -d ${DESTDIR}${${group}DIR}
|
|
${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
|
${.ALLSRC} ${DESTDIR}${${group}DIR}
|
|
.endif
|
|
Index: share/mk/bsd.info.mk
|
|
===================================================================
|
|
--- share/mk/bsd.info.mk.orig
|
|
+++ 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,12 +145,14 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x}
|
|
INSTALLINFODIRS+= ${x:S/$/-install/}
|
|
${x:S/$/-install/}:
|
|
.if !empty(.MAKEFLAGS:M-j)
|
|
+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE}
|
|
lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
|
|
${INSTALLINFO} ${INSTALLINFOFLAGS} \
|
|
--defsection=${INFOSECTION} \
|
|
--defentry=${INFOENTRY_${x}} \
|
|
${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
|
|
.else
|
|
+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE}
|
|
${INSTALLINFO} ${INSTALLINFOFLAGS} \
|
|
--defsection=${INFOSECTION} \
|
|
--defentry=${INFOENTRY_${x}} \
|
|
Index: share/mk/bsd.lib.mk
|
|
===================================================================
|
|
--- share/mk/bsd.lib.mk.orig
|
|
+++ share/mk/bsd.lib.mk
|
|
@@ -41,10 +41,6 @@ CTFFLAGS+= -g
|
|
.endif
|
|
.endif
|
|
|
|
-.if !defined(DEBUG_FLAGS)
|
|
-STRIP?= -s
|
|
-.endif
|
|
-
|
|
.include <bsd.libnames.mk>
|
|
|
|
# prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
|
|
@@ -276,14 +272,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}
|
|
Index: share/mk/bsd.libnames.mk
|
|
===================================================================
|
|
--- share/mk/bsd.libnames.mk.orig
|
|
+++ share/mk/bsd.libnames.mk
|
|
@@ -46,7 +46,7 @@ LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.
|
|
LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
|
|
LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
|
|
LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
|
|
-LIBFL?= "don't use LIBFL, use LIBL"
|
|
+LIBFL?= ${DESTDIR}${LIBDOR}/libfl.a
|
|
LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
|
|
LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a
|
|
LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
|
|
@@ -77,7 +77,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeyca
|
|
LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
|
|
LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
|
|
LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
|
|
-LIBL?= ${DESTDIR}${LIBDIR}/libl.a
|
|
+LIBL?= ${DESTDIR}${LIBDOR}/libfl.a
|
|
LIBLN?= "don't use LIBLN, use LIBL"
|
|
.if ${MK_BIND} != "no"
|
|
LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
|
|
Index: share/mk/bsd.man.mk
|
|
===================================================================
|
|
--- share/mk/bsd.man.mk.orig
|
|
+++ 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}${MANDIR}${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
|
|
Index: share/mk/bsd.prog.mk
|
|
===================================================================
|
|
--- share/mk/bsd.prog.mk.orig
|
|
+++ share/mk/bsd.prog.mk
|
|
@@ -27,10 +27,6 @@ CTFFLAGS+= -g
|
|
CFLAGS+=${CRUNCH_CFLAGS}
|
|
.endif
|
|
|
|
-.if !defined(DEBUG_FLAGS)
|
|
-STRIP?= -s
|
|
-.endif
|
|
-
|
|
.if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
|
|
LDFLAGS+= -static
|
|
.endif
|
|
@@ -152,9 +148,11 @@ realinstall: _proginstall
|
|
_proginstall:
|
|
.if defined(PROG)
|
|
.if defined(PROGNAME)
|
|
+ ${INSTALL} -d ${DESTDIR}${BINDIR}
|
|
${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
|
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
|
|
.else
|
|
+ ${INSTALL} -d ${DESTDIR}${BINDIR}
|
|
${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
|
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
|
|
.endif
|
|
@@ -182,6 +180,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} \
|
|
Index: share/mk/bsd.sys.mk
|
|
===================================================================
|
|
--- share/mk/bsd.sys.mk.orig
|
|
+++ share/mk/bsd.sys.mk
|
|
@@ -28,9 +28,6 @@ CFLAGS += -std=${CSTD}
|
|
. if defined(WARNS)
|
|
. if ${WARNS} >= 1
|
|
CWARNFLAGS += -Wsystem-headers
|
|
-. if !defined(NO_WERROR)
|
|
-CWARNFLAGS += -Werror
|
|
-. endif
|
|
. endif
|
|
. if ${WARNS} >= 2
|
|
CWARNFLAGS += -Wall -Wno-format-y2k
|
|
@@ -64,9 +61,6 @@ WFORMAT = 1
|
|
. if ${WFORMAT} > 0
|
|
#CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args
|
|
CWARNFLAGS += -Wformat=2 -Wno-format-extra-args
|
|
-. if !defined(NO_WERROR)
|
|
-CWARNFLAGS += -Werror
|
|
-. endif
|
|
. endif
|
|
. endif
|
|
.endif
|
|
Index: share/mk/bsd.links.mk
|
|
===================================================================
|
|
--- share/mk/bsd.links.mk.orig
|
|
+++ 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; \
|
|
ln -f $$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; \
|
|
ln -fs $$l $$t; \
|
|
done; true
|
|
.endif
|
|
Index: share/mk/bsd.own.mk
|
|
===================================================================
|
|
--- share/mk/bsd.own.mk.orig
|
|
+++ share/mk/bsd.own.mk
|
|
@@ -164,11 +164,6 @@ NLSMODE?= ${NOBINMODE}
|
|
|
|
INCLUDEDIR?= /usr/include
|
|
|
|
-# Common variables
|
|
-.if !defined(DEBUG_FLAGS)
|
|
-STRIP?= -s
|
|
-.endif
|
|
-
|
|
COMPRESS_CMD?= gzip -cn
|
|
COMPRESS_EXT?= .gz
|
|
|
|
Index: share/mk/sys.mk
|
|
===================================================================
|
|
--- share/mk/sys.mk.orig
|
|
+++ share/mk/sys.mk
|
|
@@ -34,11 +34,11 @@ AFLAGS ?=
|
|
CC ?= c89
|
|
CFLAGS ?= -O
|
|
.else
|
|
-CC ?= cc
|
|
+CC ?= gcc
|
|
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips"
|
|
-CFLAGS ?= -O -pipe
|
|
+CFLAGS ?= -pipe
|
|
.else
|
|
-CFLAGS ?= -O2 -pipe
|
|
+CFLAGS ?= -pipe
|
|
.endif
|
|
.if defined(NO_STRICT_ALIASING)
|
|
CFLAGS += -fno-strict-aliasing
|
|
@@ -64,7 +64,7 @@ CFLAGS += -g
|
|
.endif
|
|
.endif
|
|
|
|
-CXX ?= c++
|
|
+CXX ?= g++
|
|
CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign}
|
|
|
|
CPP ?= cpp
|
|
@@ -333,12 +333,6 @@ YFLAGS ?= -d
|
|
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
|
|
.endif
|
|
|
|
-# 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}
|