Skip to content

Commit

Permalink
sysutils/bareos-server: Fix pkg-plist
Browse files Browse the repository at this point in the history 
- Remove obsolete option entries
- Other minor modifications
- Bump PORTREVISION

PR:		276543
Reported by:	tomas at_ ciernik.sk
  • Loading branch information
@alonsobsd
alonsobsd committed Jan 24, 2024
1 parent 004f8ad commit 4392667
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 39 deletions.
16 changes: 1 addition & 15 deletions sysutils/bareos-server/Makefile
View file
@@ -1,7 +1,7 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
DISTVERSION= 23.0.1
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES?= sysutils
PKGNAMEPREFIX?= #
PKGNAMESUFFIX?= -server
Expand Down Expand Up @@ -166,16 +166,8 @@ CMAKE_ARGS+= -Dbuild-dird=ON \
# Server default database

MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx
MYSQL_VARS= DBTYPE=mysql
MYSQL_SUB_LIST= REQ_MYSQL=mysql REQ_PGSQL=""
PGSQL_CMAKE_ON= -Dpostgresql=ON
PGSQL_USES= pgsql
PGSQL_VARS= DBTYPE=postgresql
PGSQL_SUB_LIST= REQ_MYSQL="" REQ_PGSQL=postgresql
SQLITE3_VARS= DBTYPE=sqlite3

PLIST_SUB+= DBTYPE=${DBTYPE}

.endif

.if defined(WITH_CLIENT_ONLY)
Expand Down Expand Up @@ -227,10 +219,4 @@ post-install:
.include "${MASTERDIR}/Makefile.common"
.endif # -client and -server are defined

.include <bsd.port.options.mk>

.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
USES+= llvm:max=15
.endif

.include <bsd.port.mk>
41 changes: 17 additions & 24 deletions sysutils/bareos-server/pkg-plist
View file
Expand Up @@ -12,14 +12,12 @@ bin/bwild
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/WindowsAllDrives.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-gfapi.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ovirt.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreGFAPI.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ovirt.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample
Expand Down Expand Up @@ -47,7 +45,6 @@ bin/bwild
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/storage/bareos-sd.conf.sample
%%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample
etc/logrotate.d/bareos-dir
lib/bareos/backends/libbareoscats-%%DBTYPE%%.so
lib/bareos/backends/libbareossd-fifo.so
lib/bareos/backends/libbareossd-file.so
%%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so
Expand All @@ -70,23 +67,23 @@ lib/bareos/scripts/bareos-ctl-sd
lib/bareos/scripts/bareos-explorer
lib/bareos/scripts/bareos-glusterfind-wrapper
lib/bareos/scripts/create_bareos_database
%%PGSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
%%PGSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-change_owner.dbconfig-template.sql
%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.10_11.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.11_12.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.12_14.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.14_2001.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2001_2002.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2002_2003.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2003_2004.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2004_2171.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2171_2192.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2192_2210.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2210_2230.sql
%%PGSQL%%lib/bareos/scripts/ddl/updates/%%DBTYPE%%.bee.1017_2004.sql
%%PGSQL%%lib/bareos/scripts/ddl/creates/postgresql.sql
%%PGSQL%%lib/bareos/scripts/ddl/drops/postgresql.sql
%%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql-change_owner.dbconfig-template.sql
%%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql-readonly.sql
%%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql.sql
lib/bareos/scripts/ddl/updates/postgresql.10_11.sql
lib/bareos/scripts/ddl/updates/postgresql.11_12.sql
lib/bareos/scripts/ddl/updates/postgresql.12_14.sql
lib/bareos/scripts/ddl/updates/postgresql.14_2001.sql
lib/bareos/scripts/ddl/updates/postgresql.2001_2002.sql
lib/bareos/scripts/ddl/updates/postgresql.2002_2003.sql
lib/bareos/scripts/ddl/updates/postgresql.2003_2004.sql
lib/bareos/scripts/ddl/updates/postgresql.2004_2171.sql
lib/bareos/scripts/ddl/updates/postgresql.2171_2192.sql
lib/bareos/scripts/ddl/updates/postgresql.2192_2210.sql
lib/bareos/scripts/ddl/updates/postgresql.2210_2230.sql
%%PGSQL%%lib/bareos/scripts/ddl/updates/postgresql.bee.1017_2004.sql
lib/bareos/scripts/ddl/versions.map
lib/bareos/scripts/delete_catalog_backup
lib/bareos/scripts/disk-changer
Expand All @@ -95,13 +92,9 @@ lib/bareos/scripts/drop_bareos_tables
lib/bareos/scripts/grant_bareos_privileges
lib/bareos/scripts/make_bareos_tables
lib/bareos/scripts/make_catalog_backup
lib/bareos/scripts/make_catalog_backup.pl
lib/bareos/scripts/mtx-changer
lib/bareos/scripts/query.sql
lib/bareos/scripts/update_bareos_tables
lib/libbareoscats.so
lib/libbareoscats.so.23
lib/libbareoscats.so.%%LIB_VERSION%%
%%NDMP%%lib/libbareosndmp.so
%%NDMP%%lib/libbareosndmp.so.23
%%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%%
Expand Down

0 comments on commit 4392667

Please sign in to comment.