diff --git a/MOVED b/MOVED index e978c849dd03..2a1e6fe59920 100644 --- a/MOVED +++ b/MOVED @@ -9388,3 +9388,4 @@ multimedia/rubygem-av-rails5||2017-05-15|Has expired: Use multimedia/rubygem-av 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 diff --git a/ports-mgmt/Makefile b/ports-mgmt/Makefile index c2dce2802e21..e8a44212ece8 100644 --- a/ports-mgmt/Makefile +++ b/ports-mgmt/Makefile @@ -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 diff --git a/sysutils/bsdadminscripts/Makefile b/ports-mgmt/bsdadminscripts/Makefile similarity index 94% rename from sysutils/bsdadminscripts/Makefile rename to ports-mgmt/bsdadminscripts/Makefile index 5bebeee5f93b..45c054b02210 100644 --- a/sysutils/bsdadminscripts/Makefile +++ b/ports-mgmt/bsdadminscripts/Makefile @@ -1,10 +1,9 @@ -# Created by: Dominic Fandrey # $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 diff --git a/sysutils/bsdadminscripts/distinfo b/ports-mgmt/bsdadminscripts/distinfo similarity index 100% rename from sysutils/bsdadminscripts/distinfo rename to ports-mgmt/bsdadminscripts/distinfo diff --git a/sysutils/bsdadminscripts/files/distviper.in b/ports-mgmt/bsdadminscripts/files/distviper.in similarity index 100% rename from sysutils/bsdadminscripts/files/distviper.in rename to ports-mgmt/bsdadminscripts/files/distviper.in diff --git a/sysutils/bsdadminscripts/files/pkg_libchk.in b/ports-mgmt/bsdadminscripts/files/pkg_libchk.in similarity index 100% rename from sysutils/bsdadminscripts/files/pkg_libchk.in rename to ports-mgmt/bsdadminscripts/files/pkg_libchk.in diff --git a/sysutils/bsdadminscripts/files/pkg_upgrade.in b/ports-mgmt/bsdadminscripts/files/pkg_upgrade.in similarity index 100% rename from sysutils/bsdadminscripts/files/pkg_upgrade.in rename to ports-mgmt/bsdadminscripts/files/pkg_upgrade.in diff --git a/sysutils/bsdadminscripts/files/uma.in b/ports-mgmt/bsdadminscripts/files/uma.in similarity index 100% rename from sysutils/bsdadminscripts/files/uma.in rename to ports-mgmt/bsdadminscripts/files/uma.in diff --git a/sysutils/bsdadminscripts/pkg-descr b/ports-mgmt/bsdadminscripts/pkg-descr similarity index 100% rename from sysutils/bsdadminscripts/pkg-descr rename to ports-mgmt/bsdadminscripts/pkg-descr diff --git a/sysutils/bsdadminscripts/pkg-plist b/ports-mgmt/bsdadminscripts/pkg-plist similarity index 100% rename from sysutils/bsdadminscripts/pkg-plist rename to ports-mgmt/bsdadminscripts/pkg-plist diff --git a/ports-mgmt/bsdadminscripts2/Makefile b/ports-mgmt/bsdadminscripts2/Makefile new file mode 100644 index 000000000000..af46fea3893b --- /dev/null +++ b/ports-mgmt/bsdadminscripts2/Makefile @@ -0,0 +1,27 @@ +# $FreeBSD$ + +PORTNAME= bsdadminscripts2 +DISTVERSION= 0.2.0 +CATEGORIES= ports-mgmt + +MAINTAINER= kami@FreeBSD.org +COMMENT= Collection of administration scripts + +LICENSE= ISCL +LICENSE_FILE= ${WRKSRC}/LICENSE.md + +USE_GITHUB= yes +GH_ACCOUNT= lonkamikaze +GH_PROJECT= bsda2 + +NO_BUILD= yes +NO_ARCH= yes + +CONFLICTS_INSTALL= bsdadminscripts + +do-install: + @cd ${WRKSRC} && ${SH} install.sh \ + -destdir="${STAGEDIR}" -prefix="${PREFIX}" \ + -datadir="${DATADIR}" -docsdir="${DOCSDIR}" + +.include diff --git a/ports-mgmt/bsdadminscripts2/distinfo b/ports-mgmt/bsdadminscripts2/distinfo new file mode 100644 index 000000000000..39f7ca9a2a68 --- /dev/null +++ b/ports-mgmt/bsdadminscripts2/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1495004940 +SHA256 (lonkamikaze-bsda2-0.2.0_GH0.tar.gz) = 87bb936982bc07b248a9610030660ca8503eeca9de352e64dac56425717d655c +SIZE (lonkamikaze-bsda2-0.2.0_GH0.tar.gz) = 71534 diff --git a/ports-mgmt/bsdadminscripts2/pkg-descr b/ports-mgmt/bsdadminscripts2/pkg-descr new file mode 100644 index 000000000000..6c44293d0b87 --- /dev/null +++ b/ports-mgmt/bsdadminscripts2/pkg-descr @@ -0,0 +1,10 @@ +This is a collection of scripts around the use of ports and packages. + +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 diff --git a/ports-mgmt/bsdadminscripts2/pkg-plist b/ports-mgmt/bsdadminscripts2/pkg-plist new file mode 100644 index 000000000000..9f3e217aa7b0 --- /dev/null +++ b/ports-mgmt/bsdadminscripts2/pkg-plist @@ -0,0 +1,34 @@ +@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/pkg_libchk.1.gz +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 diff --git a/sysutils/Makefile b/sysutils/Makefile index d700c2332053..8a1a4ef28422 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -104,7 +104,6 @@ SUBDIR += boxbackup-devel SUBDIR += brasero SUBDIR += bsd-splash-changer - SUBDIR += bsdadminscripts SUBDIR += bsdconfig SUBDIR += bsdcrashtar SUBDIR += bsdhwmon