cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set --localstatedir=/var and fix a few file locations, ok ajacoutot@

Browse Source
This commit is contained in:
sthen 2012-04-13 20:53:19 +00:00
parent 31de771b5f
commit 64acccc545
5 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sysutils/freeipmi/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2012/03/29 13:39:00 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2012/04/13 20:53:19 sthen Exp $
# needs machine/sysarch.h & machine/pio.h
ONLY_FOR_ARCHS= amd64 arm i386
@ -7,7 +7,7 @@ COMMENT= FreeIPMI provides in-band and out-of-band IPMI software
V= 0.4.6
DISTNAME= freeipmi-${V}
REVISION= 1
REVISION= 2
SHARED_LIBS += freeipmi 4.0 # .4.0
SHARED_LIBS += ipmidetect 0.0 # .0.0
@ -38,17 +38,19 @@ LIB_DEPENDS= security/libgcrypt
SEPARATE_BUILD= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
USE_GROFF = Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED}
CONFIGURE_ARGS+=--disable-dependency-tracking
CONFIGURE_ARGS+=--disable-dependency-tracking \
--localstatedir=/var
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
FAKE_FLAGS= localstatedir=${PREFIX}/share/examples/freeipmi \
sysconfdir=${PREFIX}/share/examples/freeipmi
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/freeipmi
mv ${WRKINST}${SYSCONFDIR}/ipmi_monitoring_sensors.conf ${PREFIX}/share/examples/freeipmi
mv ${WRKINST}${SYSCONFDIR}/sysconfig ${PREFIX}/share/examples/freeipmi
rm -rf ${WRKINST}${SYSCONFDIR}/init.d
rm -rf ${WRKINST}${SYSCONFDIR}/logrotate.d
cd ${PREFIX}/share/examples/freeipmi && \
mv ${WRKINST}${SYSCONFDIR}/ipmi_monitoring_sensors.conf . && \
mv db/freeipmi/bmc-config-template db/freeipmi/ipckey . && \
rm -rf init.d logrotate.d && \
rmdir db/freeipmi db log/freeipmi log
.include <bsd.port.mk>

12
sysutils/freeipmi/patches/patch-bmc-config_bmc-autoconfig_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-bmc-config_bmc-autoconfig_Makefile_in,v 1.1 2012/04/13 20:53:19 sthen Exp $
--- bmc-config/bmc-autoconfig/Makefile.in.orig Fri Apr 13 16:41:25 2012
+++ bmc-config/bmc-autoconfig/Makefile.in Fri Apr 13 16:43:31 2012
@@ -195,7 +195,7 @@ Extensionsdir = $(sbindir)
sbin_SCRIPTS = $(EXTENSIONS)
CLEANFILES =
BMC_CONFIG_TEMPLATE = bmc-config-template
-BMC_CONFIG_TEMPLATE_DIR = $(localstatedir)/lib/$(PACKAGE)
+BMC_CONFIG_TEMPLATE_DIR = $(localstatedir)/db/$(PACKAGE)
Bmc_Config_Templatedir = $(BMC_CONFIG_TEMPLATE_DIR)
Bmc_Config_Template_DATA = $(BMC_CONFIG_TEMPLATE)
EXTRA_DIST = bmc-autoconfig $(BMC_CONFIG_TEMPLATE)

12
sysutils/freeipmi/patches/patch-libfreeipmi_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libfreeipmi_Makefile_in,v 1.1 2012/04/13 20:53:19 sthen Exp $
--- libfreeipmi/Makefile.in.orig Fri Apr 13 16:41:25 2012
+++ libfreeipmi/Makefile.in Fri Apr 13 16:43:37 2012
@@ -196,7 +196,7 @@ CLEANFILES =
DISTCLEANFILES = .deps/*.P
# Semaphore IPC Key file for ftok:
-Ipckeydir = $(localstatedir)/lib/$(PACKAGE_NAME)
+Ipckeydir = $(localstatedir)/db/$(PACKAGE_NAME)
Ipckey_DATA = ipckey
EXTRA_DIST = ipckey
all: all-recursive

15
sysutils/freeipmi/patches/patch-libfreeipmi_src_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libfreeipmi_src_Makefile_in,v 1.1.1.1 2007/10/25 18:17:02 wilfried Exp $
--- libfreeipmi/src/Makefile.in.orig Thu Oct 11 17:58:32 2007
+++ libfreeipmi/src/Makefile.in Tue Oct 23 18:09:55 2007
$OpenBSD: patch-libfreeipmi_src_Makefile_in,v 1.2 2012/04/13 20:53:19 sthen Exp $
--- libfreeipmi/src/Makefile.in.orig Thu Oct 11 16:58:32 2007
+++ libfreeipmi/src/Makefile.in Fri Apr 13 16:43:57 2012
@@ -186,7 +186,7 @@ LIBIPMICONSOLE_VERSION_INFO = @LIBIPMICONSOLE_VERSION_
LIBIPMIDETECT_VERSION_INFO = @LIBIPMIDETECT_VERSION_INFO@
LIBIPMIMONITORING_VERSION_INFO = @LIBIPMIMONITORING_VERSION_INFO@
@ -10,3 +10,12 @@ $OpenBSD: patch-libfreeipmi_src_Makefile_in,v 1.1.1.1 2007/10/25 18:17:02 wilfri
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -319,7 +319,7 @@ libfreeipmi_la_CFLAGS = -Wall
libfreeipmi_la_CPPFLAGS = \
-I$(srcdir)/../include \
-I$(srcdir)/../../common/src \
- -DIPMI_IPCKEY=\"$(localstatedir)/lib/$(PACKAGE_NAME)/ipckey\" \
+ -DIPMI_IPCKEY=\"$(localstatedir)/db/$(PACKAGE_NAME)/ipckey\" \
-DIPMI_DEBUG_IPCKEY=\"$(top_builddir)/libfreeipmi/src/ipmi-semaphores.h\" \
-D_GNU_SOURCE \
-D_REENTRANT

19
sysutils/freeipmi/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2011/11/26 14:13:26 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2012/04/13 20:53:19 sthen Exp $
%%SHARED%%
include/freeipmi/
include/freeipmi/fiid.h
@ -163,18 +163,17 @@ share/doc/freeipmi/freeipmi-coding.txt
share/doc/freeipmi/freeipmi-hostrange.txt
share/doc/freeipmi/freeipmi-libraries.txt
share/examples/freeipmi/
@sample /var/db/freeipmi/
share/examples/freeipmi/bmc-config-template
@sample /var/db/freeipmi/bmc-config-template
share/examples/freeipmi/ipckey
@sample /var/db/freeipmi/ipckey
share/examples/freeipmi/ipmi_monitoring_sensors.conf
@sample ${SYSCONFDIR}/ipmi_monitoring_sensors.conf
share/examples/freeipmi/sysconfig/
@sample ${SYSCONFDIR}/sysconfig/
share/examples/freeipmi/sysconfig/freeipmi-bmc-watchdog
@sample ${SYSCONFDIR}/sysconfig/freeipmi-bmc-watchdog
@comment var/
var/cache/
var/cache/ipmimonitoringsdrcache/
var/lib/
var/lib/freeipmi/
var/lib/freeipmi/bmc-config-template
var/lib/freeipmi/ipckey
@comment var/log/
var/log/freeipmi/
@sample /var/cache/ipmimonitoringsdrcache/
@sample /var/log/freeipmi/
@sample /var/log/ipmiconsole/