Follow e2fsprogs changes, regen PLIST and adjust WANTLIB.
ok and prodded by ajacoutot@
This commit is contained in:
kili
parent
bf1fa4f36b
commit
8a94f61ac7
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2009/10/31 20:27:51 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2010/04/03 11:54:56 kili Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
@ -9,9 +9,9 @@ COMMENT-snmp= snmp agent for heartbeat
|
||||
DISTNAME= obs-2.1.2-15
|
||||
VERSION= 2.1.2.15
|
||||
PKGNAME= heartbeat-${VERSION}
|
||||
PKGNAME-main= heartbeat-${VERSION}
|
||||
PKGNAME-gui= heartbeat-gui-${VERSION}
|
||||
PKGNAME-snmp= heartbeat-snmp-${VERSION}
|
||||
PKGNAME-main= heartbeat-${VERSION}p0
|
||||
PKGNAME-gui= heartbeat-gui-${VERSION}p0
|
||||
PKGNAME-snmp= heartbeat-snmp-${VERSION}p0
|
||||
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
CATEGORIES= sysutils
|
||||
@ -46,7 +46,7 @@ BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
|
||||
|
||||
WANTLIB-main= ${WANTLIB} crypto gcrypt gpg-error idn ncurses ssl tasn1
|
||||
LIB_DEPENDS-main=${LIB_DEPENDS} \
|
||||
uuid.>=1:e2fs-uuid-*:sysutils/e2fsprogs,-uuid \
|
||||
e2fs-uuid::sysutils/e2fsprogs \
|
||||
gnutls.>=12::security/gnutls \
|
||||
lib/libnet-1.0/net.=0:libnet->=1.0,<1.1:net/libnet/1.0 \
|
||||
bz2.>=10::archivers/bzip2 \
|
||||
@ -62,11 +62,12 @@ LIB_DEPENDS-gui=${LIB_DEPENDS} \
|
||||
bz2.>=10::archivers/bzip2 \
|
||||
gnutls.>=12::security/gnutls \
|
||||
ltdl.>=4::devel/libtool,-ltdl \
|
||||
uuid.>=1:e2fs-uuid-*:sysutils/e2fsprogs,-uuid
|
||||
e2fs-uuid::sysutils/e2fsprogs
|
||||
RUN_DEPENDS-gui=${MODPY_RUN_DEPENDS} \
|
||||
::x11/py-gtk2
|
||||
|
||||
WANTLIB-snmp= ${WANTLIB} bz2 crypto glib-2.0 kvm ltdl perl uuid wrap xml2
|
||||
WANTLIB-snmp= ${WANTLIB} bz2 crypto e2fs-uuid gcrypt glib-2.0 gnutls \
|
||||
gpg-error kvm ltdl perl tasn1 wrap xml2
|
||||
LIB_DEPENDS-snmp=${LIB_DEPENDS} \
|
||||
ccmclient,clm,hbclient,pils,plumb::${BASE_PKGPATH} \
|
||||
netsnmp.>=7,netsnmpagent,netsnmphelpers,netsnmpmibs::net/net-snmp
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-configure_in,v 1.1.1.1 2007/11/21 18:48:40 ajacoutot Exp $
|
||||
$OpenBSD: patch-configure_in,v 1.2 2010/04/03 11:54:56 kili Exp $
|
||||
--- configure.in.orig Thu Oct 25 09:40:41 2007
|
||||
+++ configure.in Mon Nov 12 14:03:47 2007
|
||||
+++ configure.in Sat Apr 3 11:39:37 2010
|
||||
@@ -224,7 +224,7 @@ includedir=`var "$includedir" "$exec_prefix/include"`
|
||||
oldincludedir=`var "$oldincludedir" "$exec_prefix/include"`
|
||||
infodir=`var "$infodir" "$prefix/info"`
|
||||
@ -19,6 +19,24 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2007/11/21 18:48:40 ajacoutot Exp $
|
||||
*) LibDirSuffix=lib64;;
|
||||
esac;;
|
||||
*32-bit*) LibDirSuffix=lib;;
|
||||
@@ -647,7 +647,7 @@ ossp)
|
||||
no) # Do not define anything; so use inbuilt (replace) implementation.
|
||||
;;
|
||||
any) # Default: try to discover an implementation that we can use.
|
||||
- AC_CHECK_LIB(uuid, uuid_parse) dnl e2fsprogs
|
||||
+ AC_CHECK_LIB(e2fs-uuid, uuid_parse) dnl e2fsprogs
|
||||
dnl AC_CHECK_LIB(uuid, uuid_create) dnl ossp
|
||||
;;
|
||||
*)
|
||||
@@ -665,7 +665,7 @@ esac
|
||||
|
||||
|
||||
AC_MSG_CHECKING(uuid implementation:)
|
||||
-if test "$ac_cv_lib_uuid_uuid_parse" = yes; then
|
||||
+if test "$ac_cv_lib_e2fs_uuid_uuid_parse" = yes; then
|
||||
AC_MSG_RESULT(e2fsprogs)
|
||||
elif test "$ac_cv_func_uuid_parse" = yes; then
|
||||
AC_MSG_RESULT(native)
|
||||
@@ -817,7 +817,7 @@ AC_DEFINE(PROCROUTE, "/proc/net/route", path were to f
|
||||
|
||||
|
||||
@ -33,7 +51,7 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2007/11/21 18:48:40 ajacoutot Exp $
|
||||
|
||||
}
|
||||
-locale_locations="/usr/share/locale /usr/lib/locale /usr/lib/nls/loc"
|
||||
+locale_locations="!!LOCALBASE!!/share/locale /usr/lib/locale /usr/lib/nls/loc"
|
||||
+locale_locations="/usr/local/share/locale /usr/lib/locale /usr/lib/nls/loc"
|
||||
LOCALE=`FindADir error "locale" $locale_locations`
|
||||
if
|
||||
test "X$LOCALE" = X
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2007/11/21 18:48:40 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.2 2010/04/03 11:54:56 kili Exp $
|
||||
@newgroup ${HBGROUP}:${HBGID}
|
||||
@newuser ${HBUSER}:${HBUID}:${HBGROUP}:daemon:Heartbeat User:/nonexistent:/sbin/nologin
|
||||
bin/cl_respawn
|
||||
@bin bin/cl_respawn
|
||||
@mode g+s
|
||||
@group ${HBGROUP}
|
||||
bin/cl_status
|
||||
@bin bin/cl_status
|
||||
@mode
|
||||
@group
|
||||
include/clplumbing/
|
||||
@ -110,17 +110,17 @@ lib/heartbeat/BasicSanityCheck
|
||||
lib/heartbeat/README.hb_report
|
||||
lib/heartbeat/ResourceManager
|
||||
lib/heartbeat/TestHeartbeatComm
|
||||
lib/heartbeat/api_test
|
||||
lib/heartbeat/apphbd
|
||||
lib/heartbeat/apphbtest
|
||||
lib/heartbeat/atest
|
||||
lib/heartbeat/attrd
|
||||
lib/heartbeat/base64_md5_test
|
||||
lib/heartbeat/ccm
|
||||
lib/heartbeat/ccm_testclient
|
||||
lib/heartbeat/cib
|
||||
lib/heartbeat/cibmon
|
||||
lib/heartbeat/clmtest
|
||||
@bin lib/heartbeat/api_test
|
||||
@bin lib/heartbeat/apphbd
|
||||
@bin lib/heartbeat/apphbtest
|
||||
@bin lib/heartbeat/atest
|
||||
@bin lib/heartbeat/attrd
|
||||
@bin lib/heartbeat/base64_md5_test
|
||||
@bin lib/heartbeat/ccm
|
||||
@bin lib/heartbeat/ccm_testclient
|
||||
@bin lib/heartbeat/cib
|
||||
@bin lib/heartbeat/cibmon
|
||||
@bin lib/heartbeat/clmtest
|
||||
lib/heartbeat/crm.dtd
|
||||
lib/heartbeat/crm_commands.py
|
||||
lib/heartbeat/crm_commands.pyc
|
||||
@ -131,11 +131,11 @@ lib/heartbeat/crm_primitive.pyo
|
||||
lib/heartbeat/crm_utils.py
|
||||
lib/heartbeat/crm_utils.pyc
|
||||
lib/heartbeat/crm_utils.pyo
|
||||
lib/heartbeat/crmd
|
||||
@bin lib/heartbeat/crmd
|
||||
lib/heartbeat/cts
|
||||
lib/heartbeat/findif
|
||||
@bin lib/heartbeat/findif
|
||||
lib/heartbeat/ha_config
|
||||
lib/heartbeat/ha_logd
|
||||
@bin lib/heartbeat/ha_logd
|
||||
lib/heartbeat/ha_logger
|
||||
lib/heartbeat/ha_propagate
|
||||
lib/heartbeat/haresources2cib.py
|
||||
@ -145,23 +145,23 @@ lib/heartbeat/hb_setsite
|
||||
lib/heartbeat/hb_setweight
|
||||
lib/heartbeat/hb_standby
|
||||
lib/heartbeat/hb_takeover
|
||||
lib/heartbeat/heartbeat
|
||||
lib/heartbeat/ipctest
|
||||
lib/heartbeat/ipctransientclient
|
||||
lib/heartbeat/ipctransientserver
|
||||
lib/heartbeat/ipfail
|
||||
lib/heartbeat/logtest
|
||||
lib/heartbeat/lrmadmin
|
||||
lib/heartbeat/lrmd
|
||||
@bin lib/heartbeat/heartbeat
|
||||
@bin lib/heartbeat/ipctest
|
||||
@bin lib/heartbeat/ipctransientclient
|
||||
@bin lib/heartbeat/ipctransientserver
|
||||
@bin lib/heartbeat/ipfail
|
||||
@bin lib/heartbeat/logtest
|
||||
@bin lib/heartbeat/lrmadmin
|
||||
@bin lib/heartbeat/lrmd
|
||||
lib/heartbeat/lrmtest
|
||||
lib/heartbeat/mach_down
|
||||
lib/heartbeat/mgmtd
|
||||
lib/heartbeat/mgmtdtest
|
||||
lib/heartbeat/mlock
|
||||
@bin lib/heartbeat/mgmtd
|
||||
@bin lib/heartbeat/mgmtdtest
|
||||
@bin lib/heartbeat/mlock
|
||||
lib/heartbeat/ocf-returncodes
|
||||
lib/heartbeat/ocf-shellfuncs
|
||||
lib/heartbeat/pengine
|
||||
lib/heartbeat/pingd
|
||||
@bin lib/heartbeat/pengine
|
||||
@bin lib/heartbeat/pingd
|
||||
lib/heartbeat/plugins/
|
||||
lib/heartbeat/plugins/AppHBNotification/
|
||||
lib/heartbeat/plugins/AppHBNotification/recmgr.la
|
||||
@ -218,17 +218,17 @@ lib/heartbeat/plugins/test/test.so
|
||||
lib/heartbeat/plugins/tiebreaker/
|
||||
lib/heartbeat/plugins/tiebreaker/twonodes.la
|
||||
lib/heartbeat/plugins/tiebreaker/twonodes.so
|
||||
lib/heartbeat/quorumd
|
||||
lib/heartbeat/quorumdtest
|
||||
lib/heartbeat/recoverymgrd
|
||||
@bin lib/heartbeat/quorumd
|
||||
@bin lib/heartbeat/quorumdtest
|
||||
@bin lib/heartbeat/recoverymgrd
|
||||
lib/heartbeat/req_resource
|
||||
lib/heartbeat/send_arp
|
||||
lib/heartbeat/stonithd
|
||||
@bin lib/heartbeat/send_arp
|
||||
@bin lib/heartbeat/stonithd
|
||||
lib/heartbeat/stonithdtest/
|
||||
lib/heartbeat/stonithdtest/apitest
|
||||
lib/heartbeat/tengine
|
||||
@bin lib/heartbeat/stonithdtest/apitest
|
||||
@bin lib/heartbeat/tengine
|
||||
lib/heartbeat/transient-test.sh
|
||||
lib/heartbeat/ttest
|
||||
@bin lib/heartbeat/ttest
|
||||
lib/heartbeat/utillib.sh
|
||||
lib/libapphb.la
|
||||
@lib lib/libapphb.so.${LIBapphb_VERSION}
|
||||
@ -386,28 +386,28 @@ lib/stonith/plugins/stonith2/wti_nps.so
|
||||
@man man/man8/ldirectord.8
|
||||
@man man/man8/meatclient.8
|
||||
@man man/man8/stonith.8
|
||||
sbin/attrd_updater
|
||||
sbin/ccm_tool
|
||||
sbin/cibadmin
|
||||
sbin/crm_attribute
|
||||
sbin/crm_diff
|
||||
sbin/crm_failcount
|
||||
sbin/crm_master
|
||||
sbin/crm_mon
|
||||
sbin/crm_resource
|
||||
@bin sbin/attrd_updater
|
||||
@bin sbin/ccm_tool
|
||||
@bin sbin/cibadmin
|
||||
@bin sbin/crm_attribute
|
||||
@bin sbin/crm_diff
|
||||
@bin sbin/crm_failcount
|
||||
@bin sbin/crm_master
|
||||
@bin sbin/crm_mon
|
||||
@bin sbin/crm_resource
|
||||
sbin/crm_sh
|
||||
sbin/crm_standby
|
||||
sbin/crm_uuid
|
||||
sbin/crm_verify
|
||||
sbin/crmadmin
|
||||
sbin/ha_logger
|
||||
@bin sbin/crm_standby
|
||||
@bin sbin/crm_uuid
|
||||
@bin sbin/crm_verify
|
||||
@bin sbin/crmadmin
|
||||
@bin sbin/ha_logger
|
||||
sbin/hb_report
|
||||
sbin/iso8601
|
||||
@bin sbin/iso8601
|
||||
sbin/ldirectord
|
||||
sbin/meatclient
|
||||
@bin sbin/meatclient
|
||||
sbin/ocf-tester
|
||||
sbin/ptest
|
||||
sbin/stonith
|
||||
@bin sbin/ptest
|
||||
@bin sbin/stonith
|
||||
share/doc/heartbeat/
|
||||
share/doc/heartbeat/AUTHORS
|
||||
share/doc/heartbeat/ChangeLog
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
@comment $OpenBSD: PLIST-snmp,v 1.1.1.1 2007/11/21 18:48:41 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-snmp,v 1.2 2010/04/03 11:54:56 kili Exp $
|
||||
lib/heartbeat/SNMPAgentSanityCheck
|
||||
lib/heartbeat/hbagent
|
||||
@bin lib/heartbeat/hbagent
|
||||
lib/stonith/plugins/stonith2/apcmastersnmp.la
|
||||
lib/stonith/plugins/stonith2/apcmastersnmp.so
|
||||
share/heartbeat/SNMPAgentSanityCheck
|
||||
|
||||
Loading…
Reference in New Issue
Block a user