pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Fixed pkglint warnings
Module Name: pkgsrc-wip
Committed By: Roland Illig <roland.illig%gmx.de@localhost>
Pushed By: rillig
Date: Sun Jul 10 00:07:01 2016 +0200
Changeset: 5a49db552f32065935a6eefb5fd7e3f2cd1d8ac3
Modified Files:
bareos/DESCR
bareos/Makefile
bareos/Makefile.common
bareos/distinfo
bareos/options.mk
bareos/patches/patch-aa
bareos/patches/patch-src_console_Makefile.in
bareos/patches/patch-src_dird_Makefile.in
bareos/patches/patch-src_filed_Makefile.in
bareos/patches/patch-src_stored_Makefile.in
Log Message:
Fixed pkglint warnings
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5a49db552f32065935a6eefb5fd7e3f2cd1d8ac3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
bareos/DESCR | 9 +--
bareos/Makefile | 6 +-
bareos/Makefile.common | 100 ++++++++++++++-------------
bareos/distinfo | 10 +--
bareos/options.mk | 12 ++--
bareos/patches/patch-aa | 2 +
bareos/patches/patch-src_console_Makefile.in | 2 +
bareos/patches/patch-src_dird_Makefile.in | 2 +
bareos/patches/patch-src_filed_Makefile.in | 2 +
bareos/patches/patch-src_stored_Makefile.in | 2 +
10 files changed, 82 insertions(+), 65 deletions(-)
diffs:
diff --git a/bareos/DESCR b/bareos/DESCR
index 274afcc..47c6256 100644
--- a/bareos/DESCR
+++ b/bareos/DESCR
@@ -1,4 +1,5 @@
-Bareos is a set of computer programs that permits the system administrator to
-manage backup, recovery, and verification of computer data across a network of
-computers of different kinds. Bareos can also run entirely upon a single computer
-and can backup to various types of media, including tape and disk.
+Bareos is a set of computer programs that permits the system
+administrator to manage backup, recovery, and verification of computer
+data across a network of computers of different kinds. Bareos can also
+run entirely upon a single computer and can backup to various types of
+media, including tape and disk.
diff --git a/bareos/Makefile b/bareos/Makefile
index 38f109a..55c9382 100644
--- a/bareos/Makefile
+++ b/bareos/Makefile
@@ -1,3 +1,5 @@
+# $NetBSD$
+
PKGREVISION= 1
.include "options.mk"
@@ -15,7 +17,7 @@ CONFIGURE_ARGS+= --with-dir-user=${BAREOS_DIR_USER}
CONFIGURE_ARGS+= --with-sd-group=${BAREOS_GROUP}
CONFIGURE_ARGS+= --with-sd-user=${BAREOS_SD_USER}
-OWN_DIRS_PERMS+= ${BAREOS_WORKINGDIR} ${ROOT_USER} ${BAREOS_GROUP} 770
+OWN_DIRS_PERMS+= ${BAREOS_WORKINGDIR} ${REAL_ROOT_USER} ${BAREOS_GROUP} 770
PKG_USERS= ${BAREOS_DIR_USER}:${BAREOS_GROUP}
PKG_USERS+= ${BAREOS_SD_USER}:${BAREOS_GROUP}
@@ -32,7 +34,7 @@ REPLACE_PERL+= src/cats/make_catalog_backup.pl.in
.include "Makefile.common"
-.if !empty(USE_DESTDIR:M[Yy][Ee][Ss])
+.if defined(USE_DESTDIR)
INSTALL_MAKE_FLAGS+= dir_user= dir_group= sd_group=
.endif
diff --git a/bareos/Makefile.common b/bareos/Makefile.common
index edae35c..d9e1e24 100644
--- a/bareos/Makefile.common
+++ b/bareos/Makefile.common
@@ -1,13 +1,15 @@
-GITHUB_PROJECT= bareos
-PKGNAME= ${GITHUB_PROJECT}-${VERSION}
+# $NetBSD$
+
+GITHUB_PROJECT= bareos
+PKGNAME= ${GITHUB_PROJECT}-${VERSION}
DISTNAME= bareos
-MASTER_SITES= ${MASTER_SITE_GITHUB:=bareos/}
-DIST_SUBDIR= ${GITHUB_PROJECT}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=bareos/}
+DIST_SUBDIR= ${GITHUB_PROJECT}
TAG= Release
-GITHUB_TAG= ${TAG}/${PKGVERSION_NOREV}
-WRKSRC= ${WRKDIR}/${DISTNAME}-${TAG}-${PKGVERSION_NOREV}
+GITHUB_TAG= ${TAG}/${PKGVERSION_NOREV}
+WRKSRC= ${WRKDIR}/${DISTNAME}-${TAG}-${PKGVERSION_NOREV}
-VERSION= 15.2.2
+VERSION= 15.2.2
CATEGORIES= sysutils
MAINTAINER= paul%paulbsd.com@localhost
@@ -24,54 +26,54 @@ GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
# For make_catalog_backup.pl.in.
-USE_TOOLS+= perl:run
-
-BAREOS_GROUP?= bareos
-BAREOS_DIR_USER?= bareos-dir
-BAREOS_SD_USER?= bareos-sd
-
-PKG_GROUPS_VARS+= BAREOS_GROUP
-PKG_USERS_VARS= BAREOS_DIR_USER BAREOS_SD_USER
-
-PKG_SYSCONFSUBDIR?= bareos
-BAREOS_PIDDIR?= ${VARBASE}/run/bareos
-BAREOS_WORKINGDIR?= ${VARBASE}/spool/bareos
-
-BUILD_DEFS+= VARBASE BAREOS_PIDDIR BAREOS_WORKINGDIR
-
-FILES_SUBST+= BAREOS_ETCDIR=${PKG_SYSCONFDIR}
-FILES_SUBST+= BAREOS_PIDDIR=${BAREOS_PIDDIR}
-FILES_SUBST+= BAREOS_GROUP=${BAREOS_GROUP}
-FILES_SUBST+= BAREOS_DIR_USER=${BAREOS_DIR_USER}
-FILES_SUBST+= BAREOS_SD_USER=${BAREOS_SD_USER}
-
-SUBST_CLASSES+= egdir
-SUBST_STAGE.egdir= pre-configure
-SUBST_FILES.egdir= src/dird/Makefile.in
-SUBST_FILES.egdir+= src/console/Makefile.in
-SUBST_FILES.egdir+= src/filed/Makefile.in
-SUBST_FILES.egdir+= src/stored/Makefile.in
-SUBST_FILES.egdir+= src/gnome2-console/Makefile.in
-SUBST_FILES.egdir+= src/wx-console/Makefile.in
-SUBST_FILES.egdir+= src/tray-monitor/Makefile.in
-SUBST_SED.egdir= -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g'
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/libexec/bareos
-CONFIGURE_ARGS+= --with-sbin-perm=0755
-CONFIGURE_ARGS+= --with-working-dir=${BAREOS_WORKINGDIR}
-CONFIGURE_ARGS+= --with-pid-dir=${BAREOS_PIDDIR}
-CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline}/include/readline
+USE_TOOLS+= perl:run
+
+BAREOS_GROUP?= bareos
+BAREOS_DIR_USER?= bareos-dir
+BAREOS_SD_USER?= bareos-sd
+
+PKG_GROUPS_VARS+= BAREOS_GROUP
+PKG_USERS_VARS= BAREOS_DIR_USER BAREOS_SD_USER
+
+PKG_SYSCONFSUBDIR?= bareos
+BAREOS_PIDDIR?= ${VARBASE}/run/bareos
+BAREOS_WORKINGDIR?= ${VARBASE}/spool/bareos
+
+BUILD_DEFS+= VARBASE BAREOS_PIDDIR BAREOS_WORKINGDIR
+
+FILES_SUBST+= BAREOS_ETCDIR=${PKG_SYSCONFDIR}
+FILES_SUBST+= BAREOS_PIDDIR=${BAREOS_PIDDIR}
+FILES_SUBST+= BAREOS_GROUP=${BAREOS_GROUP}
+FILES_SUBST+= BAREOS_DIR_USER=${BAREOS_DIR_USER}
+FILES_SUBST+= BAREOS_SD_USER=${BAREOS_SD_USER}
+
+SUBST_CLASSES+= egdir
+SUBST_STAGE.egdir= pre-configure
+SUBST_FILES.egdir= src/dird/Makefile.in
+SUBST_FILES.egdir+= src/console/Makefile.in
+SUBST_FILES.egdir+= src/filed/Makefile.in
+SUBST_FILES.egdir+= src/stored/Makefile.in
+SUBST_FILES.egdir+= src/gnome2-console/Makefile.in
+SUBST_FILES.egdir+= src/wx-console/Makefile.in
+SUBST_FILES.egdir+= src/tray-monitor/Makefile.in
+SUBST_SED.egdir= -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g'
+
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/libexec/bareos
+CONFIGURE_ARGS+= --with-sbin-perm=0755
+CONFIGURE_ARGS+= --with-working-dir=${BAREOS_WORKINGDIR}
+CONFIGURE_ARGS+= --with-pid-dir=${BAREOS_PIDDIR}
+CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline}/include/readline
.if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+= --enable-smartalloc
+CONFIGURE_ARGS+= --enable-smartalloc
.endif
.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+= --disable-xattr
+CONFIGURE_ARGS+= --disable-xattr
.endif
-PTHREAD_OPTS+= require
-PTHREAD_AUTO_VARS= yes
+PTHREAD_OPTS+= require
+PTHREAD_AUTO_VARS= yes
CONFLICTS= bacula-[0-9]*
diff --git a/bareos/distinfo b/bareos/distinfo
index 7f04578..403ac54 100644
--- a/bareos/distinfo
+++ b/bareos/distinfo
@@ -5,8 +5,8 @@ RMD160 (bareos/bareos.tar.gz) = 2fbb0176e0aba7de5eae2765e006cab0800b0c60
Size (bareos/bareos.tar.gz) = 3928036 bytes
SHA1 (patch-GNUmakefile.in) = 9afa4bf9e0818b2e969174b898c10eadcc6768b6
SHA1 (patch-Makefile.in) = 020827dae3b780a3f8e9716ed15bae90ce40a44b
-SHA1 (patch-aa) = b60a5b11dc36e6a6ebc30a685be59d28ff765b16
-SHA1 (patch-src_console_Makefile.in) = 15754702725b7fe20283a01c328ba272c4adbbb3
-SHA1 (patch-src_dird_Makefile.in) = bbe4df434087683607c5de8219d3bf9228736fab
-SHA1 (patch-src_filed_Makefile.in) = 50a119b7dc66faf0ddf9a5f2a87c6a643ea306b4
-SHA1 (patch-src_stored_Makefile.in) = e126612e0785c668b5cbe4cd6ebbc6d4bdb3e977
+SHA1 (patch-aa) = 2bdf72f63f6063da1fa3bd9533459ecb9aba9eb6
+SHA1 (patch-src_console_Makefile.in) = 4d4cf7c1a40972d2bb0695ab430f58d7cf73cc8a
+SHA1 (patch-src_dird_Makefile.in) = d6d724b506328af1d8852158ba58240db094bcfe
+SHA1 (patch-src_filed_Makefile.in) = d829be372bf3f8d54fe6c1b2c1ac99a167d3d57f
+SHA1 (patch-src_stored_Makefile.in) = d707d5029dceb1989be88e44bc3e25bf115e2c0e
diff --git a/bareos/options.mk b/bareos/options.mk
index b9c408c..44db051 100644
--- a/bareos/options.mk
+++ b/bareos/options.mk
@@ -1,8 +1,10 @@
-PKG_OPTIONS_VAR= PKG_OPTIONS.bareos
-PKG_SUPPORTED_OPTIONS= ssl lzo
-PKG_OPTIONS_REQUIRED_GROUPS= database
-PKG_OPTIONS_GROUP.database= catalog-sqlite3 catalog-pgsql catalog-mysql
-PKG_SUGGESTED_OPTIONS= ssl catalog-sqlite3
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.bareos
+PKG_SUPPORTED_OPTIONS= ssl lzo
+PKG_OPTIONS_REQUIRED_GROUPS= database
+PKG_OPTIONS_GROUP.database= catalog-sqlite3 catalog-pgsql catalog-mysql
+PKG_SUGGESTED_OPTIONS= ssl catalog-sqlite3
.include "../../mk/bsd.options.mk"
diff --git a/bareos/patches/patch-aa b/bareos/patches/patch-aa
index 6db34ae..63a01e9 100644
--- a/bareos/patches/patch-aa
+++ b/bareos/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD$
+
- need termios.h, our term.h does not include it
- t_insert_line and t_delete_line are macros in term.h; undef them
- spell HAVE_TERM_H correctly
diff --git a/bareos/patches/patch-src_console_Makefile.in b/bareos/patches/patch-src_console_Makefile.in
index bb4ea09..ed05eac 100644
--- a/bareos/patches/patch-src_console_Makefile.in
+++ b/bareos/patches/patch-src_console_Makefile.in
@@ -1,3 +1,5 @@
+$NetBSD$
+
--- src/console/Makefile.in.old 2016-01-04 21:54:23.000000000 +0100
+++ src/console/Makefile.in 2016-01-04 21:55:33.000000000 +0100
@@ -96,19 +96,19 @@
diff --git a/bareos/patches/patch-src_dird_Makefile.in b/bareos/patches/patch-src_dird_Makefile.in
index 820d0e5..0f276da 100644
--- a/bareos/patches/patch-src_dird_Makefile.in
+++ b/bareos/patches/patch-src_dird_Makefile.in
@@ -1,3 +1,5 @@
+$NetBSD$
+
--- src/dird/Makefile.in 2016-01-04 21:35:13.000000000 +0100
+++ src/dird/Makefile.in.old 2016-01-04 21:34:24.000000000 +0100
@@ -142,17 +142,17 @@
diff --git a/bareos/patches/patch-src_filed_Makefile.in b/bareos/patches/patch-src_filed_Makefile.in
index 0f16e05..225be9f 100644
--- a/bareos/patches/patch-src_filed_Makefile.in
+++ b/bareos/patches/patch-src_filed_Makefile.in
@@ -1,3 +1,5 @@
+$NetBSD$
+
--- src/filed/Makefile.in.old 2016-01-04 21:32:50.000000000 +0100
+++ src/filed/Makefile.in 2016-01-04 21:30:51.000000000 +0100
@@ -122,16 +122,16 @@
diff --git a/bareos/patches/patch-src_stored_Makefile.in b/bareos/patches/patch-src_stored_Makefile.in
index 1da742b..44f5294 100644
--- a/bareos/patches/patch-src_stored_Makefile.in
+++ b/bareos/patches/patch-src_stored_Makefile.in
@@ -1,3 +1,5 @@
+$NetBSD$
+
--- src/stored/Makefile.in 2016-01-04 21:36:52.000000000 +0100
+++ src/stored/Makefile.in.old 2016-01-04 21:36:19.000000000 +0100
@@ -243,17 +243,17 @@
Home |
Main Index |
Thread Index |
Old Index