summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbouyer <bouyer@pkgsrc.org>2012-02-18 21:08:32 +0000
committerbouyer <bouyer@pkgsrc.org>2012-02-18 21:08:32 +0000
commit2d23097215a43afef6ad8b944c8ffdd3f785fa42 (patch)
tree5288e2319a85cfc80b3566e0c8f78b3053a145b3
parentc93b97eb83f7ebfe4e49f44b3a55029fc2961418 (diff)
downloadpkgsrc-2d23097215a43afef6ad8b944c8ffdd3f785fa42.tar.gz
Fix build on OpenSolaris, from MASUDA Hideo in PR pkg/46043
-rw-r--r--sysutils/apcupsd/Makefile7
-rw-r--r--sysutils/apcupsd/distinfo4
-rw-r--r--sysutils/apcupsd/patches/patch-ap14
3 files changed, 21 insertions, 4 deletions
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 543877a0daf..04f5c1cbcde 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2012/01/22 09:07:50 shattered Exp $
+# $NetBSD: Makefile,v 1.67 2012/02/18 21:10:48 bouyer Exp $
DISTNAME= apcupsd-3.14.9
PKGREVISION= 3
@@ -71,9 +71,12 @@ PLATFORM_SUBDIR=${OPSYS:tl}
.if ${OPSYS} == "DragonFly"
PLATFORM_SUBDIR=netbsd
.endif
+.if ${OPSYS} == "SunOS"
+PLATFORM_SUBDIR=sun
+.endif
RCD_SCRIPT_SRC.apcupsd= ${WRKSRC}/platforms/${PLATFORM_SUBDIR}/apcupsd
-EGFILES= netbsd/apccontrol etc/changeme etc/commfailure etc/commok \
+EGFILES= ${PLATFORM_SUBDIR}/apccontrol etc/changeme etc/commfailure etc/commok \
etc/offbattery etc/onbattery etc/multimon.conf etc/hosts.conf
INSTALLATION_DIRS= share/examples/apcupsd share/examples/rc.d \
diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo
index 13cda87a67c..21f23efe0be 100644
--- a/sysutils/apcupsd/distinfo
+++ b/sysutils/apcupsd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2011/08/14 21:42:14 shattered Exp $
+$NetBSD: distinfo,v 1.17 2012/02/18 21:08:32 bouyer Exp $
SHA1 (apcupsd-3.14.9.tar.gz) = 1e9e8a054f17c554c047ec1d7b363d35553058bc
RMD160 (apcupsd-3.14.9.tar.gz) = be1a33b85c790fc3bc62bab370a62d014dbf0a57
@@ -16,4 +16,4 @@ SHA1 (patch-al) = bf84f2db316e944a7231ff4c75a5c903f61121dc
SHA1 (patch-am) = a2c060519748cf95f0f9aaa284f783f086c1d7d4
SHA1 (patch-an) = 4464effaf8c67e202bb6c71bad1e6c3fb87c5444
SHA1 (patch-ao) = 1f755c11e30759f023c3a1a6f23949300d1ff7f7
-SHA1 (patch-ap) = ad7d33ca160cd4ede277cf94c37d75f36e2edd4c
+SHA1 (patch-ap) = 943ef929e4c0e5f2ad7a5bae07f493f9a15fff47
diff --git a/sysutils/apcupsd/patches/patch-ap b/sysutils/apcupsd/patches/patch-ap
new file mode 100644
index 00000000000..540a39c9e77
--- /dev/null
+++ b/sysutils/apcupsd/patches/patch-ap
@@ -0,0 +1,14 @@
+$NetBSD: patch-ap,v 1.3 2012/02/18 21:08:32 bouyer Exp $
+
+# patch for sysutils/apcupsd on OpenSolaris
+--- platforms/sun/Makefile.orig 2008-06-02 06:57:56.000000000 +0900
++++ platforms/sun/Makefile 2012-02-18 15:49:42.175525737 +0900
+@@ -12,7 +12,7 @@
+ $(call MKDIR,/etc/rc1.d)
+ $(call MKDIR,/etc/rc2.d)
+ $(call MKDIR,/etc/init.d)
+- $(call INSTPROG,744,apcupsd,/etc/init.d/apcupsd)
++ $(call INSTSCRIPT,744,apcupsd,/etc/init.d/apcupsd)
+ $(call SYMLINK,../init.d/apcupsd,/etc/rc0.d/K21apcupsd)
+ $(call SYMLINK,../init.d/apcupsd,/etc/rc1.d/S89apcupsd)
+ $(call SYMLINK,../init.d/apcupsd,/etc/rc2.d/S89apcupsd)