On Tue, Feb 18, 2020 at 06:09:34PM +0000, Stuart Henderson wrote:
> On 2020/02/17 15:06, Martin Ziemer wrote:
> > Tested compilation on a empty vm with just gmake installed to see, if
> > we get problems by purging c++11-parameters.
>
> An empty VM won't help testing that, it is about whether to use --std=c++11
> or not. Removing that breaks compiling with base-gcc so you either need to
> leave it in, or disable it building on base-gcc arches.
Okay, this i got totally wrong. (Thought about dependencies)
Since i dont want to break anything (even if i can not test it on the
other arches), i think, we should leave the parameter and the comment.
> > +post-install:
> > + ${INSTALL_DATA} ${WRKBUILD}/smartd_warning.sh \
> > + ${PREFIX}/share/examples/smartmontools
>
> Should be ${INSTALL_SCRIPT}.
>
Fixed.
Created a new patch.
Tested on two amd64 systems.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/smartmontools/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile 12 Jul 2019 20:49:51 -0000 1.42
+++ Makefile 19 Feb 2020 05:11:19 -0000
@@ -3,12 +3,13 @@
COMMENT= control and monitor storage systems using SMART
# XXX at update time check whether C++11 is actually needed
-DISTNAME= smartmontools-7.0
+DISTNAME= smartmontools-7.1
CATEGORIES= sysutils
-REVISION= 0
HOMEPAGE= https://www.smartmontools.org/
+MAINTAINER = Martin Ziemer <hor...@horrad.de>
+
# GPLv2+
PERMIT_PACKAGE= Yes
@@ -27,5 +28,9 @@ CONFIGURE_ARGS= --docdir=${PREFIX}/shar
--without-gnupg
CONFIGURE_ARGS+= --without-cxx11-option
+
+post-install:
+ ${INSTALL_SCRIPT} ${WRKBUILD}/smartd_warning.sh \
+ ${PREFIX}/share/examples/smartmontools
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/smartmontools/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo 1 Mar 2019 19:35:34 -0000 1.18
+++ distinfo 19 Feb 2020 05:11:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (smartmontools-7.0.tar.gz) =
5eGsJ4a8h/29b5LQ7nUbeZ+7PhoJwKajefnrZLPo9hw=
-SIZE (smartmontools-7.0.tar.gz) = 944925
+SHA256 (smartmontools-7.1.tar.gz) =
P3NNLJneseSvYrJdlExiUt5wymTXZsTHKUVFouZZuEY=
+SIZE (smartmontools-7.1.tar.gz) = 971468
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 14 Nov 2019 19:19:30 -0000 1.14
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.14 2019/11/14 19:19:30 jasper Exp $
-
-Index: Makefile.in
---- Makefile.in.orig
-+++ Makefile.in
-@@ -372,8 +372,8 @@ man5dir = $(mandir)/man5
- man8dir = $(mandir)/man8
- NROFF = nroff
- MANS = $(man_MANS)
--DATA = $(docs_DATA) $(drivedb_DATA) $(examples_DATA) $(initd_DATA) \
-- $(sysconf_DATA) $(systemdsystemunit_DATA)
-+DATA = $(docs_DATA) $(drivedb_DATA) $(examples_DATA) \
-+ $(systemdsystemunit_DATA)
- am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- $(LISP)config.h.in
- # Read a list of newline-separated strings from the standard input,
-@@ -628,16 +628,7 @@ nodist_EXTRA_smartd_SOURCES = os_solaris_ata.s
- @OS_SOLARIS_FALSE@man_MANS = smartd.conf.5 smartctl.8 smartd.8 \
- @OS_SOLARIS_FALSE@ $(am__append_24)
- docsdir = $(docdir)
--docs_DATA = \
-- AUTHORS \
-- ChangeLog \
-- ChangeLog-5.0-6.0 \
-- COPYING \
-- INSTALL \
-- NEWS \
-- README \
-- TODO \
-- smartd.conf
-+docs_DATA = smartd.conf
-
- examplesdir = $(exampledir)
- examples_DATA = \
-@@ -649,10 +640,11 @@ examples_SCRIPTS = \
- examplescripts/Example3 \
- examplescripts/Example4 \
- examplescripts/Example5 \
-- examplescripts/Example6
-+ examplescripts/Example6 \
-+ smartd_warning.sh
-
- sysconf_DATA = smartd.conf
--smartdscript_SCRIPTS = smartd_warning.sh
-+smartdscript_SCRIPTS =
- EXTRA_DIST = \
- .editorconfig \
- autogen.sh \
