Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Oct 2012 10:27:32 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305248 - in head/sysutils/ipmitool: . files
Message-ID:  <201210041027.q94ARW9d030844@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zeising
Date: Thu Oct  4 10:27:32 2012
New Revision: 305248
URL: http://svn.freebsd.org/changeset/ports/305248

Log:
  Update to 1.8.12, which fixes build with clang.
  Turn the WITH_FREEIPMI make variable to a proper option.
  Change the NOPORTDOCS option to use the new options framework.
  
  PR:		ports/171766
  Submitted by:	zeising
  Approved by:	maintainer timeout (two weeks), kwm (mentor)

Added:
  head/sysutils/ipmitool/files/patch-configure   (contents, props changed)
Deleted:
  head/sysutils/ipmitool/files/patch-include__ipmitool__ipmi_sdr.h
  head/sysutils/ipmitool/files/patch-lib__ipmi_fru.c
  head/sysutils/ipmitool/files/patch-lib__ipmi_sdr.c
  head/sysutils/ipmitool/files/patch-src__ipmishell.c
  head/sysutils/ipmitool/files/patch-src__plugins__lan__lan.c
Modified:
  head/sysutils/ipmitool/Makefile
  head/sysutils/ipmitool/distinfo

Modified: head/sysutils/ipmitool/Makefile
==============================================================================
--- head/sysutils/ipmitool/Makefile	Thu Oct  4 10:00:38 2012	(r305247)
+++ head/sysutils/ipmitool/Makefile	Thu Oct  4 10:27:32 2012	(r305248)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ipmitool
-PORTVERSION=	1.8.11
-PORTREVISION=	4
+PORTVERSION=	1.8.12
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
@@ -15,7 +14,6 @@ MAINTAINER=	spolyack@collaborativefusion
 COMMENT=	CLI to manage IPMI systems
 
 USE_BZIP2=	yes
-DOS2UNIX=	ipmi_fwum.c
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
@@ -33,25 +31,26 @@ MAN8+=		ipmievd.8
 
 PERIODIC_DIR=	etc/periodic/daily
 
+OPTIONS_DEFINE=	FREEIPMI
+FREEIPMI_DESC=	Enable support for freeipmi
+
 .if defined(WITH_DEBUG)
 CFLAGS+=	-ggdb -Wall
 .endif
 
-.include <bsd.port.pre.mk>
-
-post-install:
-	@${MKDIR} ${PREFIX}/${PERIODIC_DIR}
-	@${INSTALL_SCRIPT} ${WRKDIR}/status-ipmi.sh ${PREFIX}/${PERIODIC_DIR}/400.status-ipmi
-
 .if exists(/usr/include/sys/ipmi.h)
 CONFIGURE_ARGS+=	--enable-intf-open
 .else
 CONFIGURE_ARGS+=	--disable-intf-open
 .endif
 
-.if defined(WITH_FREEIPMI) || \
-	(exists(${LOCALBASE}/include/freeipmi/freeipmi.h) && \
-		!defined(WITHOUT_FREEIPMI))
+.include <bsd.port.options.mk>
+
+.if empty(PORT_OPTIONS:MDOCS)
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile.in
+.endif
+
+.if ${PORT_OPTIONS:MFREEIPMI}
 LIB_DEPENDS+=	freeipmi:${PORTSDIR}/sysutils/freeipmi
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -60,8 +59,8 @@ CONFIGURE_ARGS+=	--enable-intf-free
 CONFIGURE_ARGS+=	--disable-intf-free
 .endif
 
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile.in
-.endif
+post-install:
+	@${MKDIR} ${PREFIX}/${PERIODIC_DIR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/status-ipmi.sh ${PREFIX}/${PERIODIC_DIR}/400.status-ipmi
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/sysutils/ipmitool/distinfo
==============================================================================
--- head/sysutils/ipmitool/distinfo	Thu Oct  4 10:00:38 2012	(r305247)
+++ head/sysutils/ipmitool/distinfo	Thu Oct  4 10:27:32 2012	(r305248)
@@ -1,2 +1,2 @@
-SHA256 (ipmitool-1.8.11.tar.bz2) = df219019dc2216c3b7a894edd20286b2118aa636f9990c8405674ce84948eddd
-SIZE (ipmitool-1.8.11.tar.bz2) = 584416
+SHA256 (ipmitool-1.8.12.tar.bz2) = 549b2da65c30905248aee07367a9cae3dd94bceaddd9c122d55075766c868733
+SIZE (ipmitool-1.8.12.tar.bz2) = 684159

Added: head/sysutils/ipmitool/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/ipmitool/files/patch-configure	Thu Oct  4 10:27:32 2012	(r305248)
@@ -0,0 +1,11 @@
+--- configure.orig	2012-09-18 21:50:01.000000000 +0200
++++ configure	2012-09-18 21:50:14.000000000 +0200
+@@ -5030,7 +5030,7 @@
+ done
+ 
+ 
+-CFLAGS="$CFLAGS -fno-strict-aliasing -Wreturn-type -Wno-unused-result -Wno-packed-bitfield-compat"
++CFLAGS="$CFLAGS -fno-strict-aliasing -Wreturn-type"
+ 
+ case `pwd` in
+   *\ * | *\	*)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210041027.q94ARW9d030844>