Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 May 2017 09:24:24 +0000 (UTC)
From:      Dominic Fandrey <kami@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r441068 - in head: . ports-mgmt ports-mgmt/bsdadminscripts ports-mgmt/bsdadminscripts2 ports-mgmt/bsdadminscripts2/files sysutils sysutils/bsdadminscripts
Message-ID:  <201705170924.v4H9OO6e040999@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kami
Date: Wed May 17 09:24:24 2017
New Revision: 441068
URL: https://svnweb.freebsd.org/changeset/ports/441068

Log:
  ports-mgmt/bsdadminscripts2: new port
  
  - Move sysutils/bsdadminscripts to ports-mgmt/bsdadminscripts
  - Copy ports-mgmt/bsdadminscripts to ports-mgmt/bsdadminscripts2
  - Update bsdadminscripts2 to the bsda2 project 0.2.0 release
  
  Reviewed by:	miwi
  Approved by:	miwi
  Differential Revision:	https://reviews.freebsd.org/D9434

Added:
  head/ports-mgmt/bsdadminscripts/
     - copied from r441067, head/sysutils/bsdadminscripts/
  head/ports-mgmt/bsdadminscripts2/
     - copied from r440853, head/sysutils/bsdadminscripts/
Deleted:
  head/ports-mgmt/bsdadminscripts2/files/
  head/sysutils/bsdadminscripts/
Modified:
  head/MOVED
  head/ports-mgmt/Makefile
  head/ports-mgmt/bsdadminscripts/Makefile
  head/ports-mgmt/bsdadminscripts2/Makefile
  head/ports-mgmt/bsdadminscripts2/distinfo
  head/ports-mgmt/bsdadminscripts2/pkg-descr
  head/ports-mgmt/bsdadminscripts2/pkg-plist
  head/sysutils/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed May 17 09:22:27 2017	(r441067)
+++ head/MOVED	Wed May 17 09:24:24 2017	(r441068)
@@ -9388,3 +9388,4 @@ multimedia/rubygem-av-rails5||2017-05-15
 devel/rubygem-cocaine-rails5||2017-05-15|Has expired: Use devel/rubygem-cocaine instead
 devel/rubygem-climate_control-rails5||2017-05-15|Has expired: Use devel/rubygem-climate_control instead
 net/py-twitter|net/py-python-twitter|2017-05-15|Renamed to reflect official name at PyPI/Github
+sysutils/bsdadminscripts|ports-mgmt/bsdadminscripts|2017-05-17|Move into more appropiate category

Modified: head/ports-mgmt/Makefile
==============================================================================
--- head/ports-mgmt/Makefile	Wed May 17 09:22:27 2017	(r441067)
+++ head/ports-mgmt/Makefile	Wed May 17 09:24:24 2017	(r441068)
@@ -3,6 +3,8 @@
 
     COMMENT = Ports for managing, installing, and developing FreeBSD ports and packages
 
+    SUBDIR += bsdadminscripts
+    SUBDIR += bsdadminscripts2
     SUBDIR += chucky
     SUBDIR += create-rb-port
     SUBDIR += dialog4ports

Modified: head/ports-mgmt/bsdadminscripts/Makefile
==============================================================================
--- head/sysutils/bsdadminscripts/Makefile	Wed May 17 09:22:27 2017	(r441067)
+++ head/ports-mgmt/bsdadminscripts/Makefile	Wed May 17 09:24:24 2017	(r441068)
@@ -1,10 +1,9 @@
-# Created by: Dominic Fandrey <lon_kamikaze@gmx.de>
 # $FreeBSD$
 
 PORTNAME=	bsdadminscripts
 PORTVERSION=	6.1.1
 PORTREVISION=	8
-CATEGORIES=	sysutils ports-mgmt
+CATEGORIES=	ports-mgmt sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org

Modified: head/ports-mgmt/bsdadminscripts2/Makefile
==============================================================================
--- head/sysutils/bsdadminscripts/Makefile	Sat May 13 17:27:18 2017	(r440853)
+++ head/ports-mgmt/bsdadminscripts2/Makefile	Wed May 17 09:24:24 2017	(r441068)
@@ -1,58 +1,27 @@
-# Created by: Dominic Fandrey <lon_kamikaze@gmx.de>
 # $FreeBSD$
 
-PORTNAME=	bsdadminscripts
-PORTVERSION=	6.1.1
-PORTREVISION=	8
-CATEGORIES=	sysutils ports-mgmt
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
+PORTNAME=	bsdadminscripts2
+DISTVERSION=	0.2.0
+CATEGORIES=	ports-mgmt
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	kami@FreeBSD.org
 COMMENT=	Collection of administration scripts
 
-LICENSE=	BSD2CLAUSE
+LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	lonkamikaze
+GH_PROJECT=	bsda2
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-TMP?=	/tmp
-VAR?=	/var
-
-PORTDOCS=	ABOUT CHANGES INSTALL NOTES THANKS
-
-OPTIONS_DEFINE=	DOCS
-
-SUB_FILES=	distviper pkg_libchk pkg_upgrade uma
-SUB_LIST=	TMP=${TMP} PREFIX=${PREFIX} VAR=${VAR} PORTS=${PORTSDIR}
-
-DOCS_VARS_OFF=	EVALDOCS=-nodoc
+CONFLICTS_INSTALL=	bsdadminscripts
 
 do-install:
-	cd ${WRKSRC}/src && ${SH} install.sh \
-		-prefix=${STAGEDIR}${PREFIX} \
-		-ports=${STAGEDIR}${PORTSDIR} \
-		-distdir=${STAGEDIR}${DISTDIR} \
-		-datadir=${STAGEDIR}${DATADIR} \
-		${EVALDOCS}
-.for n in distviper pkg_libchk pkg_upgrade uma
-	${MV} ${WRKDIR}/${n} ${WRKSRC}/src
-	${INSTALL_SCRIPT} ${WRKSRC}/src/${n} ${STAGEDIR}${PREFIX}/sbin
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/src/buildflags.mk ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/src/buildflags.conf.sample \
-		${STAGEDIR}${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/src/uma.conf.sample ${STAGEDIR}${PREFIX}/etc
-
-.for f in bsdadminscripts buildflags.awk buildflags.conf buildflags.mk \
-	distviper pkg_libchk pkg_upgrade pkg_validate portconfig rcstart uma
-	${INSTALL_MAN} ${WRKSRC}/src/${f}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-.endfor
-	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${MV} ${STAGEDIR}${PREFIX}/etc/*.sample ${STAGEDIR}${ETCDIR}
-	${RM} -r ${STAGEDIR}${PREFIX}/etc/*.sample
-
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC} && ${SH} install.sh \
+		-destdir="${STAGEDIR}" -prefix="${PREFIX}" \
+		-datadir="${DATADIR}" -docsdir="${DOCSDIR}"
 
 .include <bsd.port.mk>

Modified: head/ports-mgmt/bsdadminscripts2/distinfo
==============================================================================
--- head/sysutils/bsdadminscripts/distinfo	Sat May 13 17:27:18 2017	(r440853)
+++ head/ports-mgmt/bsdadminscripts2/distinfo	Wed May 17 09:24:24 2017	(r441068)
@@ -1,2 +1,3 @@
-SHA256 (bsdadminscripts-6.1.1.tar.gz) = 68b47c51801a8ce1e7b69ec654c7521b1b1fcf2d3fe9184f4d2e4a1b6f4656bb
-SIZE (bsdadminscripts-6.1.1.tar.gz) = 73925
+TIMESTAMP = 1495004940
+SHA256 (lonkamikaze-bsda2-0.2.0_GH0.tar.gz) = 87bb936982bc07b248a9610030660ca8503eeca9de352e64dac56425717d655c
+SIZE (lonkamikaze-bsda2-0.2.0_GH0.tar.gz) = 71534

Modified: head/ports-mgmt/bsdadminscripts2/pkg-descr
==============================================================================
--- head/sysutils/bsdadminscripts/pkg-descr	Sat May 13 17:27:18 2017	(r440853)
+++ head/ports-mgmt/bsdadminscripts2/pkg-descr	Wed May 17 09:24:24 2017	(r441068)
@@ -1,7 +1,10 @@
-This is a collection of administration scripts. At the moment it
-consists of a script to control rc.d scripts at runtime, a
-script that runs common make targets on batches of ports, scripts to set
-variables for make jobs (like portconf, but with more possibilities).
-And scripts to check for broken packages and missing libraries.
+This is a collection of scripts around the use of ports and packages.
 
-WWW: https://sourceforge.net/projects/bsdadminscripts/
+It allows you to: 
+- check library dependencies without producing false positives (pkg_libchk)
+- lets you manage the autoremove flag for leaf packages (pkg_trim)
+- remove obsolete or damaged distfiles (distviper)
+- manage build flags (buildflags.conf)
+- auto-create pkg-plist files taking port options into account (makeplist)
+
+WWW: https://github.com/lonkamikaze/bsda2

Modified: head/ports-mgmt/bsdadminscripts2/pkg-plist
==============================================================================
--- head/sysutils/bsdadminscripts/pkg-plist	Sat May 13 17:27:18 2017	(r440853)
+++ head/ports-mgmt/bsdadminscripts2/pkg-plist	Wed May 17 09:24:24 2017	(r441068)
@@ -1,35 +1,34 @@
-sbin/distviper
-sbin/pkg_libchk
-sbin/pkg_upgrade
-sbin/pkg_validate
-sbin/portconfig
-sbin/rcstart
-sbin/uma
-sbin/rcstatus
-sbin/rcstop
-sbin/rcrestart
-sbin/rconestart
-sbin/rconestatus
-sbin/rconestop
-sbin/rconerestart
-sbin/portbuild
-sbin/portclean
-sbin/portfetch
-sbin/portpackage
-sbin/portconfig-recursive
-sbin/portfetch-recursive
-man/man1/bsdadminscripts.1.gz
+@sample etc/buildflags.conf.sample
 man/man1/buildflags.awk.1.gz
 man/man1/buildflags.conf.1.gz
 man/man1/buildflags.mk.1.gz
-man/man1/distviper.1.gz
 man/man1/pkg_libchk.1.gz
-man/man1/pkg_upgrade.1.gz
-man/man1/pkg_validate.1.gz
-man/man1/portconfig.1.gz
-man/man1/rcstart.1.gz
-man/man1/uma.1.gz
-%%ETCDIR%%/buildflags.conf.sample
-%%ETCDIR%%/uma.conf.sample
+man/man8/distviper.8.gz
+man/man8/makeplist.8.gz
+man/man8/pkg_trim.8.gz
+sbin/distviper
+sbin/makeplist
+sbin/pkg_libchk
+sbin/pkg_trim
+%%DATADIR%%/bsda_bsdmake.sh
+%%DATADIR%%/bsda_container.sh
+%%DATADIR%%/bsda_dialog.sh
+%%DATADIR%%/bsda_fifo.sh
+%%DATADIR%%/bsda_obj.sh
+%%DATADIR%%/bsda_opts.sh
+%%DATADIR%%/bsda_tty.sh
+%%DATADIR%%/bsda_util.sh
 %%DATADIR%%/buildflags.awk
 %%DATADIR%%/buildflags.mk
+%%DATADIR%%/distviper.sh
+%%DATADIR%%/interrupt.mk
+%%DATADIR%%/makeplist.sh
+%%DATADIR%%/options.mk
+%%DATADIR%%/pkg_info.sh
+%%DATADIR%%/pkg_libchk.sh
+%%DATADIR%%/pkg_options.sh
+%%DATADIR%%/pkg_query.sh
+%%DATADIR%%/pkg_trim.sh
+%%PORTDOCS%%%%DOCSDIR%%/bsda_obj.md
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
+%%PORTDOCS%%%%DOCSDIR%%/README.md

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Wed May 17 09:22:27 2017	(r441067)
+++ head/sysutils/Makefile	Wed May 17 09:24:24 2017	(r441068)
@@ -104,7 +104,6 @@
     SUBDIR += boxbackup-devel
     SUBDIR += brasero
     SUBDIR += bsd-splash-changer
-    SUBDIR += bsdadminscripts
     SUBDIR += bsdconfig
     SUBDIR += bsdcrashtar
     SUBDIR += bsdhwmon



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705170924.v4H9OO6e040999>