Attachment 117989 Details for Bug 160148 – file.diff

[patch] file.diff

file.diff (text/plain), 5.98 KB, created by tkato432 on 2011-08-24 19:50:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2011-08-24 19:50:38 UTC

Size: 5.98 KB

patch

obsolete

>diff -urN /usr/ports/sysutils/powerman/Makefile sysutils/powerman/Makefile
>--- /usr/ports/sysutils/powerman/Makefile	2011-08-03 15:48:44.000000000 +0900
>+++ sysutils/powerman/Makefile	2011-08-25 00:53:55.000000000 +0900
>@@ -5,34 +5,38 @@
> # $FreeBSD: ports/sysutils/powerman/Makefile,v 1.12 2011/08/02 16:27:05 bapt Exp $
> 
> PORTNAME=	powerman
>-PORTVERSION=	2.3.5
>-PORTREVISION=	1
>+PORTVERSION=	2.3.9
> CATEGORIES=	sysutils parallel
>-MASTER_SITES=	SF
>+MASTER_SITES=	GOOGLE_CODE
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	PowerMan is a tool for doing remote power control
>+COMMENT=	A tool for doing remote power control
> 
>-BROKEN=	does not fetch
>+LICENSE=	GPLv2 # (or later)
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
> 
>-USE_PERL5_BUILD=	yes
>-USE_BZIP2=	yes
>+USE_PERL5_BUILD=yes
> GNU_CONFIGURE=	yes
>+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
> CONFIGURE_ARGS=	--with-httppower --localstatedir=${DESTDIR}/var \
> 		--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
>-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
> USE_LDCONFIG=	yes
>-USE_RC_SUBR=	powerman.sh
>+MAKE_JOBS_SAFE=	yes
> 
>-CFLAGS+=	-I${LOCALBASE}/include -DHAVE_CURL
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+USE_RC_SUBR=	powerman.sh
> 
> MAN1=		pm.1 powerman.1
> MAN3=		libpowerman.3
> MAN5=		powerman.conf.5 powerman.dev.5
>-MAN7=		powerman-devices.7
> MAN8=		httppower.8 plmpower.8 powermand.8 vpcd.8
> 
>+CPPFLAGS=	-I${LOCALBASE}/include
>+LDFLAGS=	-L${LOCALBASE}/lib
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e \
>+		'/^install-data-am/s|:.*|:|' ${WRKSRC}/scripts/Makefile.in
>+
> .include <bsd.port.mk>
>diff -urN /usr/ports/sysutils/powerman/distinfo sysutils/powerman/distinfo
>--- /usr/ports/sysutils/powerman/distinfo	2011-03-20 02:54:02.000000000 +0900
>+++ sysutils/powerman/distinfo	2011-08-22 21:24:24.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (powerman-2.3.5.tar.bz2) = 4caa03e925ed086c5c9886c0335e0646cb099e65ba213a43d34ec04432fd5d7a
>-SIZE (powerman-2.3.5.tar.bz2) = 410179
>+SHA256 (powerman-2.3.9.tar.gz) = d669767b037e38ee339c01b5b02fe586027489addcd59c45d9d5061d6ca0365f
>+SIZE (powerman-2.3.9.tar.gz) = 654883
>diff -urN /usr/ports/sysutils/powerman/files/patch-scripts-Makefile.in sysutils/powerman/files/patch-scripts-Makefile.in
>--- /usr/ports/sysutils/powerman/files/patch-scripts-Makefile.in	2009-07-26 23:27:31.000000000 +0900
>+++ sysutils/powerman/files/patch-scripts-Makefile.in	1970-01-01 09:00:00.000000000 +0900
>@@ -1,13 +0,0 @@
>---- scripts/Makefile.in.orig	2009-07-26 08:01:17.510482199 +0900
>-+++ scripts/Makefile.in		2009-07-26 08:02:53.221139841 +0900
>-@@ -371,10 +371,6 @@
>- 
>- install-data-local:
>- 	-$(top_srcdir)/config/install-sh -m 755 -d \
>--		$(DESTDIR)$(sysconfdir)/init.d
>--	$(top_srcdir)/config/install-sh -m 755 $(srcdir)/powerman.init \
>--		$(DESTDIR)$(sysconfdir)/init.d/powerman
>--	-$(top_srcdir)/config/install-sh -m 755 -d \
>- 		$(DESTDIR)$(libdir)/stonith/plugins/external
>- 	$(top_srcdir)/config/install-sh -m 755 $(srcdir)/stonith-powerman \
>- 		$(DESTDIR)$(libdir)/stonith/plugins/external/powerman
>diff -urN /usr/ports/sysutils/powerman/pkg-descr sysutils/powerman/pkg-descr
>--- /usr/ports/sysutils/powerman/pkg-descr	2009-02-17 05:04:30.000000000 +0900
>+++ sysutils/powerman/pkg-descr	2011-08-22 21:17:54.000000000 +0900
>@@ -3,4 +3,4 @@
> natively by PowerMan and Expect-like configurability simplifies the
> addition of new devices.
> 
>-WWW: http://powerman.sf.net/
>+WWW: http://code.google.com/p/powerman/
>diff -urN /usr/ports/sysutils/powerman/pkg-plist sysutils/powerman/pkg-plist
>--- /usr/ports/sysutils/powerman/pkg-plist	2009-07-26 23:27:31.000000000 +0900
>+++ sysutils/powerman/pkg-plist	2011-08-22 21:35:44.000000000 +0900
>@@ -1,44 +1,51 @@
> @stopdaemon powerman
> bin/pm
> bin/powerman
>-etc/powerman/apc.dev
>-etc/powerman/apc7900.dev
>-etc/powerman/apcnew.dev
>-etc/powerman/apcold.dev
>-etc/powerman/apcpdu.dev
>-etc/powerman/apcpdu3.dev
>-etc/powerman/bashfun.dev
>-etc/powerman/baytech-rpc28-nc.dev
>-etc/powerman/baytech-rpc3-nc.dev
>-etc/powerman/baytech.dev
>-etc/powerman/cb-7050.dev
>-etc/powerman/cyclades-pm10.dev
>-etc/powerman/cyclades-pm20.dev
>-etc/powerman/cyclades-pm42.dev
>-etc/powerman/cyclades-pm8.dev
>-etc/powerman/dli.dev
>-etc/powerman/hp3488.dev
>-etc/powerman/hpilo.dev
>-etc/powerman/hpmp.dev
>-etc/powerman/hpmpblade.dev
>-etc/powerman/hpmpcell.dev
>-etc/powerman/hpmpdome.dev
>-etc/powerman/ibmbladecenter.dev
>-etc/powerman/icebox.dev
>-etc/powerman/icebox3.dev
>-etc/powerman/ics8064.dev
>-etc/powerman/ilom.dev
>-etc/powerman/ipmi.dev
>-etc/powerman/ipmipower.dev
>-etc/powerman/lom.dev
>-etc/powerman/phantom.dev
>-etc/powerman/plmpower.dev
>-etc/powerman/powerman.conf.example
>-etc/powerman/powerman.dev
>-etc/powerman/swpdu.dev
>-etc/powerman/vpc.dev
>-etc/powerman/wti-rps10.dev
>-etc/powerman/wti.dev
>+%%ETCDIR%%/apc-snmp.dev
>+%%ETCDIR%%/apc.dev
>+%%ETCDIR%%/apc7900.dev
>+%%ETCDIR%%/apc7900v3.dev
>+%%ETCDIR%%/apc7920.dev
>+%%ETCDIR%%/apcnew.dev
>+%%ETCDIR%%/apcold.dev
>+%%ETCDIR%%/apcpdu.dev
>+%%ETCDIR%%/apcpdu3.dev
>+%%ETCDIR%%/appro-greenblade.dev
>+%%ETCDIR%%/bashfun.dev
>+%%ETCDIR%%/baytech-rpc28-nc.dev
>+%%ETCDIR%%/baytech-rpc3-nc.dev
>+%%ETCDIR%%/baytech-snmp.dev
>+%%ETCDIR%%/baytech.dev
>+%%ETCDIR%%/cb-7050.dev
>+%%ETCDIR%%/cyclades-pm10.dev
>+%%ETCDIR%%/cyclades-pm20.dev
>+%%ETCDIR%%/cyclades-pm42.dev
>+%%ETCDIR%%/cyclades-pm8.dev
>+%%ETCDIR%%/dli.dev
>+%%ETCDIR%%/eaton-epdu-blue-switched.dev
>+%%ETCDIR%%/eaton-revelation-snmp.dev
>+%%ETCDIR%%/hp3488.dev
>+%%ETCDIR%%/hpilo.dev
>+%%ETCDIR%%/hpmp.dev
>+%%ETCDIR%%/hpmpblade.dev
>+%%ETCDIR%%/hpmpcell.dev
>+%%ETCDIR%%/hpmpdome.dev
>+%%ETCDIR%%/ibmbladecenter.dev
>+%%ETCDIR%%/icebox.dev
>+%%ETCDIR%%/icebox3.dev
>+%%ETCDIR%%/ics8064.dev
>+%%ETCDIR%%/ilom.dev
>+%%ETCDIR%%/ipmi.dev
>+%%ETCDIR%%/ipmipower.dev
>+%%ETCDIR%%/lom.dev
>+%%ETCDIR%%/phantom.dev
>+%%ETCDIR%%/plmpower.dev
>+%%ETCDIR%%/powerman.conf.example
>+%%ETCDIR%%/powerman.dev
>+%%ETCDIR%%/swpdu.dev
>+%%ETCDIR%%/vpc.dev
>+%%ETCDIR%%/wti-rps10.dev
>+%%ETCDIR%%/wti.dev
> include/libpowerman.h
> lib/libpowerman.a
> lib/libpowerman.la
>@@ -53,7 +60,7 @@
> @dirrm lib/stonith/plugins/external
> @dirrm lib/stonith/plugins
> @dirrm lib/stonith
>-@dirrmtry etc/powerman
>+@dirrmtry %%ETCDIR%%
> @cwd /
> @dirrmtry /var/run/powerman
> @cwd %%PREFIX%%

Actions: View | Diff

Attachments on bug 160148: 117989