Date: Thu, 1 Oct 2015 20:32:07 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398384 - in head/ports-mgmt/bpm: . files Message-ID: <201510012032.t91KW7WT085097@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Oct 1 20:32:07 2015 New Revision: 398384 URL: https://svnweb.freebsd.org/changeset/ports/398384 Log: - Fix staging as non-root - While here, regenerate other patches with make makepatch - Add LICENSE - Drop USES=desktop-file-utils as suggested by stage-qa Modified: head/ports-mgmt/bpm/Makefile head/ports-mgmt/bpm/files/patch-mk_sk.global.mk head/ports-mgmt/bpm/files/patch-mk_sk.lib.mk head/ports-mgmt/bpm/files/patch-mk_sk.localerule.mk head/ports-mgmt/bpm/files/patch-mk_sk.progrule.mk head/ports-mgmt/bpm/files/patch-mk_sk.scriptrule.mk head/ports-mgmt/bpm/files/patch-mk_sk.sharerule.mk head/ports-mgmt/bpm/files/patch-src__refresh.c head/ports-mgmt/bpm/files/patch-src_install.c Modified: head/ports-mgmt/bpm/Makefile ============================================================================== --- head/ports-mgmt/bpm/Makefile Thu Oct 1 20:02:39 2015 (r398383) +++ head/ports-mgmt/bpm/Makefile Thu Oct 1 20:32:07 2015 (r398384) @@ -10,11 +10,13 @@ MASTER_SITES= http://www.meowfishies.com MAINTAINER= ports@FreeBSD.org COMMENT= Graphical BSD ports collection manager +LICENSE= BSD4CLAUSE + RUN_DEPENDS= portupgrade:${PORTSDIR}/ports-mgmt/portupgrade \ gnomesu:${PORTSDIR}/security/libgnomesu \ gdialog:${PORTSDIR}/x11/zenity -USES= desktop-file-utils pkgconfig tar:tgz +USES= pkgconfig tar:tgz USE_GNOME= gtk20 MAKE_ENV+= OSTYPE="${OPSYS}" Modified: head/ports-mgmt/bpm/files/patch-mk_sk.global.mk ============================================================================== --- head/ports-mgmt/bpm/files/patch-mk_sk.global.mk Thu Oct 1 20:02:39 2015 (r398383) +++ head/ports-mgmt/bpm/files/patch-mk_sk.global.mk Thu Oct 1 20:32:07 2015 (r398384) @@ -1,6 +1,6 @@ ---- mk/sk.global.mk.orig 2008-08-09 08:27:47.000000000 -0400 -+++ mk/sk.global.mk 2008-08-09 08:29:12.000000000 -0400 -@@ -51,10 +51,6 @@ +--- mk/sk.global.mk.orig 2004-08-24 04:03:29 UTC ++++ mk/sk.global.mk +@@ -51,10 +51,6 @@ CPPFLAGS+= -I${.CURDIR}/${BASE_DIR}/mk/i .PATH: ${.CURDIR}/${BASE_DIR}/mk/src PICFLAGS = -fpic Modified: head/ports-mgmt/bpm/files/patch-mk_sk.lib.mk ============================================================================== --- head/ports-mgmt/bpm/files/patch-mk_sk.lib.mk Thu Oct 1 20:02:39 2015 (r398383) +++ head/ports-mgmt/bpm/files/patch-mk_sk.lib.mk Thu Oct 1 20:32:07 2015 (r398384) @@ -1,6 +1,6 @@ ---- ./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 @@ +--- mk/sk.lib.mk.orig 2004-06-08 00:31:49 UTC ++++ mk/sk.lib.mk +@@ -83,16 +83,16 @@ ${LIB}.so${SO_SUFFIX}: ${SOBJS} install: .ifndef INTERNAL_LIB .ifndef NO_STATIC Modified: head/ports-mgmt/bpm/files/patch-mk_sk.localerule.mk ============================================================================== --- head/ports-mgmt/bpm/files/patch-mk_sk.localerule.mk Thu Oct 1 20:02:39 2015 (r398383) +++ head/ports-mgmt/bpm/files/patch-mk_sk.localerule.mk Thu Oct 1 20:32:07 2015 (r398384) @@ -1,5 +1,5 @@ ---- ./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 +--- mk/sk.localerule.mk.orig 2004-08-24 03:15:03 UTC ++++ mk/sk.localerule.mk @@ -36,12 +36,12 @@ install: @@ -8,8 +8,9 @@ + [ -d ${DESTDIR}${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES ] ||\ mkdir -p -m ${DIR_MODE}\ - ${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES;\ +- ${INSTALL} ${INST_FLAGS} -o ${SHARE_OWN} -g ${SHARE_GRP} -m\ + ${DESTDIR}${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES;\ - ${INSTALL} ${INST_FLAGS} -o ${SHARE_OWN} -g ${SHARE_GRP} -m\ ++ ${INSTALL} ${INST_FLAGS} -m\ ${SHARE_MODE} $$l.mo\ - ${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES/${PACKAGE}.mo;\ + ${DESTDIR}${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES/${PACKAGE}.mo;\ Modified: head/ports-mgmt/bpm/files/patch-mk_sk.progrule.mk ============================================================================== --- head/ports-mgmt/bpm/files/patch-mk_sk.progrule.mk Thu Oct 1 20:02:39 2015 (r398383) +++ head/ports-mgmt/bpm/files/patch-mk_sk.progrule.mk Thu Oct 1 20:32:07 2015 (r398384) @@ -1,16 +1,21 @@ ---- ./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 @@ +--- mk/sk.progrule.mk.orig 2004-06-07 23:11:45 UTC ++++ mk/sk.progrule.mk +@@ -40,13 +40,13 @@ all: ${PROG}.${MAN_SECT} .endif install:: - [ -d ${PREFIX}/${BIN_DIR} ] ||\ - mkdir -p -m ${DIR_MODE} ${PREFIX}/${BIN_DIR} +- ${INSTALL} ${INST_FLAGS} ${STRIP} -o ${BIN_OWN} -g ${BIN_GRP} ${PROG}\ +- ${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} ++ ${INSTALL} ${INST_FLAGS} ${STRIP} ${PROG}\ + ${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}\ +- ${INSTALL} ${INST_FLAGS} -o ${SHARE_OWN} -g ${SHARE_GRP}\ ++ ${INSTALL} ${INST_FLAGS} \ + -m ${SHARE_MODE} ${PROG}.${MAN_SECT} ${MAN_DIR} + @for l in ${MAN_LINKS};\ + do ln -sfv ${MAN_DIR}/${PROG}.${MAN_SECT} $$l;\ Modified: head/ports-mgmt/bpm/files/patch-mk_sk.scriptrule.mk ============================================================================== --- head/ports-mgmt/bpm/files/patch-mk_sk.scriptrule.mk Thu Oct 1 20:02:39 2015 (r398383) +++ head/ports-mgmt/bpm/files/patch-mk_sk.scriptrule.mk Thu Oct 1 20:32:07 2015 (r398384) @@ -1,5 +1,5 @@ ---- ./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 +--- mk/sk.scriptrule.mk.orig 2004-06-02 02:09:53 UTC ++++ mk/sk.scriptrule.mk @@ -37,11 +37,11 @@ all: @@ -9,8 +9,9 @@ + [ -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}\ +- ${INSTALL} ${INST_FLAGS} -o ${BIN_OWN} -g ${BIN_GRP}\ - -m ${BIN_MODE} $$s.*sh ${PREFIX}/${SCRIPT_DIR}/$$s;\ ++ ${INSTALL} ${INST_FLAGS} \ + -m ${BIN_MODE} $$s.*sh ${DESTDIR}${PREFIX}/${SCRIPT_DIR}/$$s;\ done Modified: head/ports-mgmt/bpm/files/patch-mk_sk.sharerule.mk ============================================================================== --- head/ports-mgmt/bpm/files/patch-mk_sk.sharerule.mk Thu Oct 1 20:02:39 2015 (r398383) +++ head/ports-mgmt/bpm/files/patch-mk_sk.sharerule.mk Thu Oct 1 20:32:07 2015 (r398384) @@ -1,5 +1,5 @@ ---- ./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 +--- mk/sk.sharerule.mk.orig 2004-07-23 03:45:59 UTC ++++ mk/sk.sharerule.mk @@ -37,11 +37,11 @@ all: ${SHARES} @@ -9,8 +9,9 @@ + [ -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}\ +- ${INSTALL} -o ${SHARE_OWN} -g ${SHARE_GRP} -m ${SHARE_MODE}\ - $$s ${PREFIX}/${SHARE_DIR};\ ++ ${INSTALL} -m ${SHARE_MODE}\ + $$s ${DESTDIR}${PREFIX}/${SHARE_DIR};\ done Modified: head/ports-mgmt/bpm/files/patch-src__refresh.c ============================================================================== --- head/ports-mgmt/bpm/files/patch-src__refresh.c Thu Oct 1 20:02:39 2015 (r398383) +++ head/ports-mgmt/bpm/files/patch-src__refresh.c Thu Oct 1 20:32:07 2015 (r398384) @@ -1,5 +1,5 @@ ---- src/refresh.c.orig 2004-08-23 19:40:08.000000000 -0700 -+++ src/refresh.c 2008-03-05 14:30:58.000000000 -0800 +--- src/refresh.c.orig 2004-08-24 02:40:08 UTC ++++ src/refresh.c @@ -62,8 +62,18 @@ __RCSID("$Id: refresh.c,v 1.32 2004/08/24 02:40:08 sethk Exp $"); @@ -20,7 +20,7 @@ #define DB_DIR "/var/db/pkg" #define ITER_BYTES (128 * 1024) #define ITER_ENTS 32 -@@ -183,10 +193,12 @@ +@@ -183,10 +193,12 @@ _refresh_index_parse(gchar *line, if (*sp == '|') ++i; @@ -35,7 +35,7 @@ #endif /* DEBUG */ return FALSE; } -@@ -195,12 +207,9 @@ +@@ -195,12 +207,9 @@ _refresh_index_parse(gchar *line, for (i = 0; i < PFIELD_NFIELD; ++i) { @@ -51,7 +51,7 @@ switch (i) { -@@ -320,7 +329,6 @@ +@@ -320,7 +329,6 @@ _refresh_index_iter(struct refresh_data if (_refresh_index_parse(ln, portdp, rdp) != TRUE) { Modified: head/ports-mgmt/bpm/files/patch-src_install.c ============================================================================== --- head/ports-mgmt/bpm/files/patch-src_install.c Thu Oct 1 20:02:39 2015 (r398383) +++ head/ports-mgmt/bpm/files/patch-src_install.c Thu Oct 1 20:32:07 2015 (r398384) @@ -1,6 +1,6 @@ ---- src/install.c.orig Sun Apr 2 14:09:25 2006 -+++ src/install.c Sun Apr 2 14:12:03 2006 -@@ -958,6 +958,8 @@ +--- src/install.c.orig 2004-08-24 04:03:44 UTC ++++ src/install.c +@@ -958,6 +958,8 @@ install_action_run(struct install_data * av[ac++] = "SU_CMD=" SU_CMD; av[ac++] = "-M"; av[ac++] = "FETCH_CMD=" FETCH_CMD; @@ -9,7 +9,7 @@ av[ac++] = "-s"; av[ac++] = "-S"; av[ac++] = SU_CMD " '%s'"; -@@ -971,6 +973,7 @@ +@@ -971,6 +973,7 @@ install_action_run(struct install_data * av[ac++] = "make"; av[ac++] = "SU_CMD=" SU_CMD; av[ac++] = "FETCH_CMD=" FETCH_CMD;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510012032.t91KW7WT085097>