4 files changed, 18 insertions, 43 deletions

diff --git a/devel/libpci/Makefile b/devel/libpci/Makefile
index 62417131a7cd..b17304d71f7a 100644
--- a/devel/libpci/Makefile
+++ b/devel/libpci/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libpci
-PORTVERSION=	3.1.9
+PORTVERSION=	3.1.10
 CATEGORIES=	devel
 MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
 		LOCAL/sunpoet
@@ -15,6 +15,8 @@ DISTNAME=	pciutils-${PORTVERSION}
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PCI configuration space I/O made easy
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
 
 ALL_TARGET=	lib/libpci.a
@@ -30,16 +32,24 @@ LIBPCI_FILES=	include/pci/config.h include/pci/header.h include/pci/pci.h \
 		libdata/pkgconfig/libpci.pc
 
 post-patch:
-	@${REINPLACE_CMD} 's|^CC=|CC?=|; s|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/Makefile
+	@${LN} -s . ${WRKSRC}/lib/pci
+	@${REINPLACE_CMD} \
+		-e 's|^CC=.*$$|CC=${CC}|' \
+		-e 's|^CFLAGS=|CFLAGS+=|' \
+		-e 's|^IDSDIR=.*$$|IDSDIR=${PREFIX}/share/pciids|' \
+		-e 's|^OPT=.*$$|OPT=-fPIC|' \
+		-e 's|^PREFIX=.*$$|PREFIX=${PREFIX}|' \
+			${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's|^#include "|&pci/|' ${WRKSRC}/lib/pci.h
 
 post-build:
-	@${REINPLACE_CMD} 's|^#include "|&pci/|' ${WRKSRC}/lib/pci.h
+	cd ${WRKSRC}/lib/ && ${CC} ${CFLAGS} -shared *.o -lz -o libpci.so
 
 do-install:
-	@${MKDIR} ${PREFIX}/include/pci/
+	${MKDIR} ${PREFIX}/include/pci/
 .for file in ${LIBPCI_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/lib/${file:T} ${PREFIX}/${file}
+	${INSTALL_DATA} ${WRKSRC}/lib/${file:T} ${PREFIX}/${file}
 .endfor
-	@${LN} -fs libpci.so ${PREFIX}/lib/libpci.so.3
+	${LN} -fs libpci.so ${PREFIX}/lib/libpci.so.3
 
 .include <bsd.port.mk>
diff --git a/devel/libpci/distinfo b/devel/libpci/distinfo
index a75ba6e969f7..ef7ba06267d2 100644
--- a/devel/libpci/distinfo
+++ b/devel/libpci/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pciutils-3.1.9.tar.gz) = 8ae7d320c50f02b015f5e2bb17a9f815cf201dae81b6bbd46b8a45552d00a178
-SIZE (pciutils-3.1.9.tar.gz) = 340215
+SHA256 (pciutils-3.1.10.tar.gz) = 7ca8201f806cbad31cb86bcbb2c2c99853cc05618b360eb58bde31a0f8d1f2a3
+SIZE (pciutils-3.1.10.tar.gz) = 345149
diff --git a/devel/libpci/files/patch-Makefile b/devel/libpci/files/patch-Makefile
deleted file mode 100644
index 44f576364acb..000000000000
--- a/devel/libpci/files/patch-Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.orig	2010-02-01 01:42:12.000000000 +0800
-+++ Makefile	2010-09-29 20:31:29.000000000 +0800
-@@ -1,8 +1,7 @@
- # Makefile for The PCI Utilities
- # (c) 1998--2010 Martin Mares <mj@ucw.cz>
- 
--OPT=-O2
--CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
-+CFLAGS+=-fPIC -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
- 
- VERSION=3.1.7
- DATE=2010-01-31
-@@ -25,10 +24,10 @@
- ABI_VERSION=.3
- 
- # Installation directories
--PREFIX=/usr/local
-+PREFIX=%%PREFIX%%
- SBINDIR=$(PREFIX)/sbin
- SHAREDIR=$(PREFIX)/share
--IDSDIR=$(SHAREDIR)
-+IDSDIR=$(SHAREDIR)/pciids
- MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
- INCDIR=$(PREFIX)/include
- LIBDIR=$(PREFIX)/lib
diff --git a/devel/libpci/files/patch-lib::Makefile b/devel/libpci/files/patch-lib::Makefile
deleted file mode 100644
index 6cace9d07d1f..000000000000
--- a/devel/libpci/files/patch-lib::Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/Makefile.orig	2009-07-04 13:11:04.000000000 -0300
-+++ lib/Makefile	2010-03-08 19:39:24.000000000 -0300
-@@ -49,6 +49,7 @@
- 	rm -f $@
- 	$(AR) rcs $@ $^
- 	$(RANLIB) $@
-+	$(CC) $(CFLAGS) -shared $^ -lz -o libpci.so
- else
- CFLAGS += -fPIC -fvisibility=hidden
- $(PCILIB): $(addsuffix .o,$(OBJS))