1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

ports-mgmt/bpm: Fix staging

This commit is contained in:
Rene Ladan 2014-08-22 00:30:08 +00:00
parent bbf593aecb
commit ca0726c02e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=365606
5 changed files with 93 additions and 0 deletions

View File

@ -0,0 +1,25 @@
--- ./mk/sk.lib.mk.orig 2004-06-08 02:31:49.000000000 +0200
+++ ./mk/sk.lib.mk 2014-08-22 02:02:31.000000000 +0200
@@ -83,16 +83,16 @@
install:
.ifndef INTERNAL_LIB
.ifndef NO_STATIC
- [ -d ${PREFIX}/${LIB_DIR} ] ||\
- mkdir -p -m ${DIR_MODE} ${PREFIX}/${LIB_DIR}
+ [ -d ${DESTDIR}${PREFIX}/${LIB_DIR} ] ||\
+ mkdir -p -m ${DIR_MODE} ${DESTDIR}${PREFIX}/${LIB_DIR}
${INSTALL} ${INST_FLAGS} ${STRIP} -o ${LIB_OWN} -g ${LIB_GRP}\
- -m ${LIB_MODE} ${LIB}.a ${PREFIX}/${LIB_DIR}
+ -m ${LIB_MODE} ${LIB}.a ${DESTDIR}${PREFIX}/${LIB_DIR}
.endif
.ifndef NO_SHARED
- [ -d ${PREFIX}/${LIB_DIR} ] ||\
- mkdir -p -m ${DIR_MODE} ${PREFIX}/${LIB_DIR}
+ [ -d ${DESTDIR}${PREFIX}/${LIB_DIR} ] ||\
+ mkdir -p -m ${DIR_MODE} ${DESTDIR}${PREFIX}/${LIB_DIR}
${INSTALL} ${INST_FLAGS} ${STRIP} -o ${LIB_OWN} -g ${LIB_GRP}\
- -m ${LIB_MODE} ${LIB}.so${SO_SUFFIX} ${PREFIX}/${LIB_DIR}
+ -m ${LIB_MODE} ${LIB}.so${SO_SUFFIX} ${DESTDIR}${PREFIX}/${LIB_DIR}
.endif
.endif # INTERNAL_LIB

View File

@ -0,0 +1,18 @@
--- ./mk/sk.localerule.mk.orig 2004-08-24 05:15:03.000000000 +0200
+++ ./mk/sk.localerule.mk 2014-08-22 02:03:51.000000000 +0200
@@ -36,12 +36,12 @@
install:
@set -x; for l in ${LANGS}; do\
- [ -d ${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES ] ||\
+ [ -d ${DESTDIR}${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES ] ||\
mkdir -p -m ${DIR_MODE}\
- ${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES;\
+ ${DESTDIR}${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES;\
${INSTALL} ${INST_FLAGS} -o ${SHARE_OWN} -g ${SHARE_GRP} -m\
${SHARE_MODE} $$l.mo\
- ${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES/${PACKAGE}.mo;\
+ ${DESTDIR}${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES/${PACKAGE}.mo;\
done
.include "sk.targets.mk"

View File

@ -0,0 +1,16 @@
--- ./mk/sk.progrule.mk.orig 2004-06-08 01:11:45.000000000 +0200
+++ ./mk/sk.progrule.mk 2014-08-22 02:04:46.000000000 +0200
@@ -40,10 +40,10 @@
.endif
install::
- [ -d ${PREFIX}/${BIN_DIR} ] ||\
- mkdir -p -m ${DIR_MODE} ${PREFIX}/${BIN_DIR}
+ [ -d ${DESTDIR}${PREFIX}/${BIN_DIR} ] ||\
+ mkdir -p -m ${DIR_MODE} ${DESTDIR}${PREFIX}/${BIN_DIR}
${INSTALL} ${INST_FLAGS} ${STRIP} -o ${BIN_OWN} -g ${BIN_GRP} ${PROG}\
- ${PREFIX}/${BIN_DIR}
+ ${DESTDIR}${PREFIX}/${BIN_DIR}
.ifndef NOMAN
[ -d ${MAN_DIR} ] || @mkdir -p -m ${DIR_MODE} ${MAN_DIR}
${INSTALL} ${INST_FLAGS} -o ${SHARE_OWN} -g ${SHARE_GRP}\

View File

@ -0,0 +1,17 @@
--- ./mk/sk.scriptrule.mk.orig 2004-06-02 04:09:53.000000000 +0200
+++ ./mk/sk.scriptrule.mk 2014-08-22 02:06:04.000000000 +0200
@@ -37,11 +37,11 @@
all:
install:
- [ -d ${PREFIX}/${SCRIPT_DIR} ] ||\
- mkdir -p -m ${DIR_MODE} ${PREFIX}/${SCRIPT_DIR}
+ [ -d ${DESTDIR}${PREFIX}/${SCRIPT_DIR} ] ||\
+ mkdir -p -m ${DIR_MODE} ${DESTDIR}${PREFIX}/${SCRIPT_DIR}
@set -x; for s in ${SCRIPTS}; do\
${INSTALL} ${INST_FLAGS} -o ${BIN_OWN} -g ${BIN_GRP}\
- -m ${BIN_MODE} $$s.*sh ${PREFIX}/${SCRIPT_DIR}/$$s;\
+ -m ${BIN_MODE} $$s.*sh ${DESTDIR}${PREFIX}/${SCRIPT_DIR}/$$s;\
done
.include "${BASE_DIR}/mk/sk.targets.mk"

View File

@ -0,0 +1,17 @@
--- ./mk/sk.sharerule.mk.orig 2004-07-23 05:45:59.000000000 +0200
+++ ./mk/sk.sharerule.mk 2014-08-22 02:06:57.000000000 +0200
@@ -37,11 +37,11 @@
all: ${SHARES}
install:
- [ -d ${PREFIX}/${SHARE_DIR} ] ||\
- mkdir -p -m ${DIR_MODE} ${PREFIX}/${SHARE_DIR}
+ [ -d ${DESTDIR}${PREFIX}/${SHARE_DIR} ] ||\
+ mkdir -p -m ${DIR_MODE} ${DESTDIR}${PREFIX}/${SHARE_DIR}
@set -x; for s in ${SHARES}; do\
${INSTALL} -o ${SHARE_OWN} -g ${SHARE_GRP} -m ${SHARE_MODE}\
- $$s ${PREFIX}/${SHARE_DIR};\
+ $$s ${DESTDIR}${PREFIX}/${SHARE_DIR};\
done
.include "${BASE_DIR}/mk/sk.targets.mk"