as usual, any added check will catch errors

in that case, install -d with no directory names is now an error, as it
should be.
This commit is contained in:
espie 2020-04-08 18:25:48 +00:00
parent 4027ac0d80
commit 7bd6e62370
3 changed files with 20 additions and 10 deletions

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-Makefile,v 1.3 2014/07/11 05:59:24 giovanni Exp $
--- Makefile.orig Mon Feb 13 17:54:08 2012
+++ Makefile Thu Jun 26 09:48:08 2014
$OpenBSD: patch-Makefile,v 1.4 2020/04/08 18:25:48 espie Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -1,10 +1,10 @@
INSTALL = install
-ETCDIR = $(ROOTDIR)/etc
@ -26,14 +27,14 @@ $OpenBSD: patch-Makefile,v 1.3 2014/07/11 05:59:24 giovanni Exp $
clean:
rm -f sqlgrey.1
@@ -43,22 +44,26 @@ clean:
@@ -43,22 +44,25 @@ clean:
install: all
$(INSTALL) -d -m 755 $(SBINDIR)
- $(INSTALL) -d -m 755 $(ETCDIR)
+ $(INSTALL) -d -m 755 $(DOCDIR)
$(INSTALL) -d -m 755 $(CONFDIR)
$(INSTALL) -d -m 755 $(INITDIR)
- $(INSTALL) -d -m 755 $(INITDIR)
$(INSTALL) -d -m 755 $(MANDIR)
$(INSTALL) -d -m 755 $(BINDIR)
$(INSTALL) -m 755 sqlgrey $(SBINDIR)

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-sqlgrey,v 1.2 2014/07/11 05:59:24 giovanni Exp $
--- sqlgrey.orig Mon Feb 13 17:54:08 2012
+++ sqlgrey Thu Jun 26 10:01:05 2014
$OpenBSD: patch-sqlgrey,v 1.3 2020/04/08 18:25:48 espie Exp $
Index: sqlgrey
--- sqlgrey.orig
+++ sqlgrey
@@ -32,6 +32,7 @@ use Pod::Usage;
use Getopt::Long 2.25 qw(:config posix_default no_ignore_case);
use Net::Server::Multiplex;
@ -9,6 +10,15 @@ $OpenBSD: patch-sqlgrey,v 1.2 2014/07/11 05:59:24 giovanni Exp $
use Math::BigInt;
use POSIX ':sys_wait_h';
@@ -39,7 +40,7 @@ use POSIX ':sys_wait_h';
use vars qw(@ISA);
@ISA = qw(Net::Server::Multiplex);
-my $VERSION = "1.8.0";
+my $VERSION = "";
my $software = 'SQLgrey-' . $VERSION;
my $DB_VERSION = 3;
@@ -2475,7 +2476,7 @@ sub read_conffile($)
s/\s+$//; # no trailing white
next unless length; # anything left ?

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2019/07/12 20:48:39 sthen Exp $
# $OpenBSD: Makefile,v 1.13 2020/04/08 18:25:48 espie Exp $
COMMENT= Perl interface to Radius
@ -101,7 +101,6 @@ post-install:
.for file in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${file} ${DOCDIR}
.endfor
${INSTALL_DATA_DIR} ${EXDIR}
${MODCPAN_POST_INSTALL}
.include <bsd.port.mk>