Attachment 131639 Details for Bug 175761 – superiotool-20121019.patch

[patch] superiotool-20121019.patch

superiotool-20121019.patch (text/plain), 4.85 KB, created by Andriy Gapon on 2013-02-01 13:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Gapon

Created: 2013-02-01 13:10:00 UTC

Size: 4.85 KB

patch

obsolete

>diff -ruN --exclude=CVS ../superiotool.orig/Makefile ./Makefile
>--- ../superiotool.orig/Makefile	2012-11-17 08:01:46.000000000 +0200
>+++ ./Makefile	2013-02-01 15:04:25.125180623 +0200
>@@ -1,50 +1,29 @@
>-# New ports collection makefile for:	superiotool
>-# Date created:		2009-09-30
>-# Whom:			Andriy Gapon <avg@icyb.net.ua>
>-#
>-# $FreeBSD: ports/sysutils/superiotool/Makefile,v 1.5 2012/11/17 06:01:46 svnexp Exp $
>-#
>-
>-PORTNAME=	superiotool
>-DISTVERSION=	20090930
>-CATEGORIES=	sysutils
>-MASTER_SITES=	http://www.icyb.net.ua/~avg/distfiles/
>-
>-MAINTAINER=	avg@icyb.net.ua
>-COMMENT=	Helper tool for Super I/O chip detection and analysis
>-
>-USE_BZIP2=	yes
>-USE_GMAKE=	yes
>-
>-PLIST_FILES=	sbin/superiotool
>-MAN8=		superiotool.8
>-
>-WRKSRC=		${WRKDIR}/${PORTNAME}
>-SVNROOT=	svn://coreboot.org/repos/trunk/util/superiotool
>-
>-gen-dist:
>-	@if [ ! -f ${LOCALBASE}/bin/svn ]; then \
>-		${ECHO_CMD} "ERROR: You need to have devel/subversion installed for gen-dist target"; \
>-		${FALSE}; \
>-	fi
>-	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
>-		${MKDIR} ${WRKDIR}/svn; \
>-		cd ${WRKDIR}/svn && svn co ${SVNROOT}; \
>-		${TAR} cfj ${_DISTDIR}${DISTFILES} ${PORTNAME}; \
>-		cd ${WRKDIR} && ${RM} -rf svn; \
>-		cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} makesum; \
>-	fi
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e 's#/share/man/#/man/#g' -e 's#-ansi##g' \
>-		-Ee '\#^(CC|INSTALL|PREFIX)#s#=#?=#' \
>-		-e '\#^CFLAGS#s#=#+=#' -e 's#-O2##' \
>-		${WRKSRC}/Makefile
>-
>-.include <bsd.port.pre.mk>
>-
>-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
>-BROKEN=		Does not compile on ia64, powerpc, or sparc64: attempts to use i386 asm
>-.endif
>+# Created by: Andriy Gapon <avg@icyb.net.ua>
>+# $FreeBSD: ports/sysutils/superiotool/Makefile,v 1.4 2010/09/25 18:20:25 makc Exp $
> 
>-.include <bsd.port.post.mk>
>+PORTNAME=		superiotool
>+DISTVERSION=		20121019
>+CATEGORIES=		sysutils
>+MASTER_SITES=		${MASTER_SITE_LOCAL} \
>+			http://www.icyb.net.ua/~avg/distfiles/
>+MASTER_SITE_SUBDIR=	avg
>+
>+MAINTAINER=		avg@icyb.net.ua
>+COMMENT=		Helper tool for Super I/O chip detection and analysis
>+
>+LIB_DEPENDS=		pci:${PORTSDIR}/devel/libpci
>+
>+ONLY_FOR_ARCHS=		i386 amd64
>+ONLY_FOR_ARCHS_REASON=	The tool is for x86-specific hardware
>+
>+USE_BZIP2=		yes
>+USE_GMAKE=		yes
>+
>+PLIST_FILES=		sbin/superiotool
>+MAN8=			superiotool.8
>+
>+WRKSRC=			${WRKDIR}/${PORTNAME}
>+UPSTREAM_VERS=		4.0-2827-g1a00cf0
>+MAKE_ENV+=		VERSION=-DSUPERIOTOOL_VERSION='\"${UPSTREAM_VERS}\"'
>+
>+.include <bsd.port.mk>
>diff -ruN --exclude=CVS ../superiotool.orig/distinfo ./distinfo
>--- ../superiotool.orig/distinfo	2011-03-19 14:33:24.000000000 +0200
>+++ ./distinfo	2012-11-02 17:33:07.293125000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (superiotool-20090930.tar.bz2) = 2d06800cc1e24622526d6a1dc729eaee94e7a50ffd2600e60064a77fcebb3dca
>-SIZE (superiotool-20090930.tar.bz2) = 29348
>+SHA256 (superiotool-20121019.tar.bz2) = d4140f3a50e53f46dd9b1edfc8353113f29f437201907d613150d431dbfc7a62
>+SIZE (superiotool-20121019.tar.bz2) = 29827
>diff -ruN --exclude=CVS ../superiotool.orig/files/patch-Makefile ./files/patch-Makefile
>--- ../superiotool.orig/files/patch-Makefile	1970-01-01 03:00:00.000000000 +0300
>+++ ./files/patch-Makefile	2012-11-02 17:33:07.295126000 +0200
>@@ -0,0 +1,49 @@
>+--- Makefile.orig	2012-10-19 16:44:32.000000000 +0300
>++++ Makefile	2012-10-20 01:32:35.427651135 +0300
>+@@ -20,28 +20,24 @@
>+ 
>+ PROGRAM = superiotool
>+ 
>+-CC      = gcc
>+-INSTALL = /usr/bin/install
>+-PREFIX  = /usr/local
>++CC      ?= gcc
>++INSTALL ?= /usr/bin/install
>++PREFIX  ?= /usr/local
>+ 
>+ # Set the superiotool version string to the output of 'git describe'.
>+ 
>+-VERSION := -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"'
>+-
>+-CFLAGS += -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \
>+-         -Werror-implicit-function-declaration -ansi -pedantic $(VERSION)
>+-LDFLAGS += -lz
>++VERSION ?= -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"'
>+ 
>+ OBJS = superiotool.o serverengines.o ali.o fintek.o ite.o nsc.o nuvoton.o \
>+        smsc.o winbond.o infineon.o
>+ 
>+-OS_ARCH = $(shell uname)
>++OS_ARCH = FreeBSD
>+ ifeq ($(OS_ARCH), Darwin)
>+ LIBS = -framework IOKit -framework DirectHW -lpci -lz
>+ endif
>+ ifeq ($(OS_ARCH), FreeBSD)
>+-CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
>+-         -Werror-implicit-function-declaration -ansi $(VERSION) \
>++CFLAGS += -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
>++         -Werror-implicit-function-declaration $(VERSION) \
>+          -I/usr/local/include
>+ LDFLAGS += -L/usr/local/lib
>+ LIBS = -lz
>+@@ -69,8 +65,8 @@ $(PROGRAM): $(OBJS) superiotool.h
>+ install: $(PROGRAM)
>+ 	mkdir -p $(DESTDIR)$(PREFIX)/sbin
>+ 	$(INSTALL) $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
>+-	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8
>+-	$(INSTALL) $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
>++	mkdir -p $(DESTDIR)$(PREFIX)/man/man8
>++	$(INSTALL) $(PROGRAM).8 $(DESTDIR)$(PREFIX)/man/man8
>+ 
>+ clean:
>+ 	rm -f $(PROGRAM) *.o

Actions: View | Diff

Attachments on bug 175761: 131639