Attachment #114032 for bug #155664




#

PORTNAME=	dmidecode
PORTVERSION=	2.11
CATEGORIES=	sysutils
MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
		ftp://ftp.nuug.no/pub/anders/distfiles/

ONLY_FOR_ARCHS=	i386 amd64 ia64

USE_BZIP2=	yes
MAKE_ENV+=	DOCSDIR="${DOCSDIR}" LDFLAGS="${LDFLAGS}"
LICENSE=	GPLv2

PORTDOCS=	AUTHORS CHANGELOG README

post-patch:
.if defined(NOPORTDOCS)
post-patch:
	@${REINPLACE_CMD} -e '/^install.*:/s,install-doc,,' ${WRKSRC}/Makefile
.endif

.else
PORTDOCS=	AUTHORS CHANGELOG README
	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
.for f in ${PORTDOCS}
	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
.endfor
.endif

.include <bsd.port.pre.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +2 lines)
1	MD5 (dmidecode-2.10.tar.bz2) = 3c9c4d55a40b78600f3b43bfa64616f9	1	SHA256 (dmidecode-2.11.tar.bz2) = 6da5643479b3b591b71a91122a25b89b77920b66e1ad0a5162d3c75b50423b51
2	SHA256 (dmidecode-2.10.tar.bz2) = 4d74a3e93353320317a424816f9a045df06d9ed4b5b80881e16fdfcc74c9e2c0	2	SIZE (dmidecode-2.11.tar.bz2) = 54537
3	SIZE (dmidecode-2.10.tar.bz2) = 51904




--- Makefile.orig	2010-10-11 10:08:16.000000000 -0400
+++ Makefile	2011-03-18 12:55:54.000000000 -0400
@@ -12,30 +12,30 @@
 #   (at your option) any later version.
 #
 
-CC      = gcc

 
 # Pass linker flags here
-LDFLAGS =
+LDFLAGS+= $(CFLAGS)
 
 DESTDIR =
-prefix  = /usr/local

+docdir  = $(DOCSDIR)
 
 INSTALL         := install
-INSTALL_DATA    := $(INSTALL) -m 644
+INSTALL_DATA    := $(BSD_INSTALL_DATA)
 INSTALL_DIR     := $(INSTALL) -m 755 -d
-INSTALL_PROGRAM := $(INSTALL) -m 755
+INSTALL_PROGRAM := $(BSD_INSTALL_PROGRAM)
 RM              := rm -f
 
 # BSD make provides $MACHINE, but GNU make doesn't

Return to bug 155664

Lines 6-12 Link Here

(-)Makefile (-12 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= dmidecode	8	PORTNAME= dmidecode
9	PORTVERSION= 2.10	9	PORTVERSION= 2.11
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= ${MASTER_SITE_SAVANNAH} \	11	MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
12	ftp://ftp.nuug.no/pub/anders/distfiles/	12	ftp://ftp.nuug.no/pub/anders/distfiles/
Lines 18-38 Link Here
18	ONLY_FOR_ARCHS= i386 amd64 ia64	18	ONLY_FOR_ARCHS= i386 amd64 ia64
19		19
20	USE_BZIP2= yes	20	USE_BZIP2= yes
21	MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" DOCSDIR="${DOCSDIR}"	21	MAKE_ENV+= DOCSDIR="${DOCSDIR}" LDFLAGS="${LDFLAGS}"
		22	LICENSE= GPLv2
22		23
23	PORTDOCS= AUTHORS CHANGELOG README
24
25	post-patch:
26	.if defined(NOPORTDOCS)	24	.if defined(NOPORTDOCS)
		25	post-patch:
27	@${REINPLACE_CMD} -e '/^install.*:/s,install-doc,,' ${WRKSRC}/Makefile	26	@${REINPLACE_CMD} -e '/^install.*:/s,install-doc,,' ${WRKSRC}/Makefile
28	.endif
29		27
30	post-install:	28	.else
31	.if !defined(NOPORTDOCS)	29	PORTDOCS= AUTHORS CHANGELOG README
32	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
33	.for f in ${PORTDOCS}
34	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
35	.endfor
36	.endif	30	.endif
37		31
38	.include <bsd.port.pre.mk>	32	.include <bsd.port.pre.mk>

Lines 1-7 Link Here

(-)files/patch-Makefile (-6 / +13 lines)
1	--- Makefile.orig Tue Feb 7 09:45:21 2006	1	--- Makefile.orig 2010-10-11 10:08:16.000000000 -0400
2	+++ Makefile Tue Feb 7 09:47:11 2006	2	+++ Makefile 2011-03-18 12:55:54.000000000 -0400
3	@@ -8,25 +8,25 @@	3	@@ -12,30 +12,30 @@
4	# Licensed under the GNU Public License.	4	# (at your option) any later version.
5	#	5	#
6		6
7	-CC = gcc	7	-CC = gcc
Lines 20-26 Link Here
20		20
21	# Pass linker flags here	21	# Pass linker flags here
22	-LDFLAGS =	22	-LDFLAGS =
23	+LDFLAGS+=	23	+LDFLAGS+= $(CFLAGS)
24		24
25	DESTDIR =	25	DESTDIR =
26	-prefix = /usr/local	26	-prefix = /usr/local
Lines 33-36 Link Here
33	+docdir = $(DOCSDIR)	33	+docdir = $(DOCSDIR)
34		34
35	INSTALL := install	35	INSTALL := install
36	INSTALL_DATA := $(INSTALL) -m 644	36	-INSTALL_DATA := $(INSTALL) -m 644
		37	+INSTALL_DATA := $(BSD_INSTALL_DATA)
		38	INSTALL_DIR := $(INSTALL) -m 755 -d
		39	-INSTALL_PROGRAM := $(INSTALL) -m 755
		40	+INSTALL_PROGRAM := $(BSD_INSTALL_PROGRAM)
		41	RM := rm -f
		42
		43	# BSD make provides $MACHINE, but GNU make doesn't