ports/149018: [PATCH] devel/libpci: simplify makefile, take maintainership

[Sunpoet Po-Chuan Hsieh]

>Number:         149018
>Category:       ports
>Synopsis:       [PATCH] devel/libpci: simplify makefile, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 28 01:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.1-STABLE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Sun Jul 25 00:09:24 CST 2010
>Description:
- Simplify Makefile
- Take maintainership

Removed file(s):
- files/pci.h
- pkg-plist

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- libpci-3.1.7_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/libpci/Makefile /usr/ports/sunpoet/libpci/Makefile
--- /usr/ports/devel/libpci/Makefile	2010-03-14 02:15:18.000000000 +0800
+++ /usr/ports/sunpoet/libpci/Makefile	2010-07-26 09:16:49.000000000 +0800
@@ -15,27 +15,29 @@
 MASTER_SITE_SUBDIR=	software/utils/pciutils
 DISTNAME=	pciutils-${PORTVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	sunpoet at sunpoet.net
 COMMENT=	PCI configuration space I/O made easy
 
+ALL_TARGET=	lib/libpci.a
+MAKE_ENV=	LANG=C
 USE_GMAKE=	yes
-NO_INSTALL_MANPAGES=	yes
 USE_LDCONFIG=	yes
-MAKE_ENV=	LANG=C
-ALL_TARGET=	lib/libpci.a
+
+PLIST_DIRS=	include/pci
+PLIST_FILES=	${LIBPCI_FILES} lib/libpci.so
+
+LIBPCI_FILES=	include/pci/config.h include/pci/header.h include/pci/pci.h \
+		include/pci/types.h lib/libpci.a lib/libpci.so.3 \
+		libdata/pkgconfig/libpci.pc
 
 post-build:
-	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/pci.h
+	@${REINPLACE_CMD} 's|^#include "|&pci/|' ${WRKSRC}/lib/pci.h
 
 do-install:
-	@(${INSTALL_DATA} ${WRKSRC}/lib/libpci.so ${PREFIX}/lib/libpci.so.3)
-	@(${INSTALL_DATA} ${WRKSRC}/lib/libpci.a ${PREFIX}/lib/libpci.a)
-	@(${LN} -sf ${PREFIX}/lib/libpci.so.3 ${PREFIX}/lib/libpci.so)
-	@(${MKDIR} ${PREFIX}/include/pci)
-	@(${INSTALL_DATA} ${WRKSRC}/lib/config.h ${PREFIX}/include/pci/config.h)
-	@(${INSTALL_DATA} ${WRKSRC}/lib/header.h ${PREFIX}/include/pci/header.h)
-	@(${INSTALL_DATA} ${WRKSRC}/lib/pci.h ${PREFIX}/include/pci/pci.h)
-	@(${INSTALL_DATA} ${WRKSRC}/lib/types.h ${PREFIX}/include/pci/types.h)
-	@(${INSTALL_DATA} ${WRKSRC}/lib/libpci.pc ${PREFIX}/libdata/pkgconfig/libpci.pc)
+	@${MKDIR} ${PREFIX}/include/pci/
+.for file in ${PLIST_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/lib/${file:T} ${PREFIX}/${file}
+.endfor
+	@${LN} -fs libpci.so.3 ${PREFIX}/lib/libpci.so
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/devel/libpci/files/pci.h /usr/ports/sunpoet/libpci/files/pci.h
--- /usr/ports/devel/libpci/files/pci.h	2010-03-11 16:24:29.000000000 +0800
+++ /usr/ports/sunpoet/libpci/files/pci.h	1970-01-01 08:00:00.000000000 +0800
@@ -1,17 +0,0 @@
---- lib/pci.h.orig	2009-07-04 13:11:04.000000000 -0300
-+++ lib/pci.h	2010-03-08 19:46:36.000000000 -0300
-@@ -10,11 +10,11 @@
- #define _PCI_LIB_H
- 
- #ifndef PCI_CONFIG_H
--#include "config.h"
-+#include "pci/config.h"
- #endif
- 
--#include "header.h"
--#include "types.h"
-+#include "pci/header.h"
-+#include "pci/types.h"
- 
- #define PCI_LIB_VERSION 0x030100
- 
diff -ruN --exclude=CVS /usr/ports/devel/libpci/pkg-plist /usr/ports/sunpoet/libpci/pkg-plist
--- /usr/ports/devel/libpci/pkg-plist	2010-03-12 19:39:53.000000000 +0800
+++ /usr/ports/sunpoet/libpci/pkg-plist	1970-01-01 08:00:00.000000000 +0800
@@ -1,9 +0,0 @@
-include/pci/config.h
-include/pci/header.h
-include/pci/pci.h
-include/pci/types.h
-lib/libpci.a
-lib/libpci.so
-lib/libpci.so.3
-libdata/pkgconfig/libpci.pc
- at dirrm include/pci
--- libpci-3.1.7_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: