Attachment #58726 for bug #88431

View | Details | Raw Unified | Return to bug 88431
Collapse All | Expand All

Lines 6-12 Link Here

(-)dmidecode/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= dmidecode	8	PORTNAME= dmidecode
9	PORTVERSION= 2.6	9	PORTVERSION= 2.7
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 20-26 Link Here
20	USE_BZIP2= yes	20	USE_BZIP2= yes
21	USE_REINPLACE= yes	21	USE_REINPLACE= yes
22	USE_GETOPT_LONG= yes	22	USE_GETOPT_LONG= yes
23	MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	23	MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" DOCSDIR="${DOCSDIR}"
24		24
25	PORTDOCS= AUTHORS CHANGELOG README	25	PORTDOCS= AUTHORS CHANGELOG README
26		26

Lines 1-2 Link Here

(-)dmidecode/distinfo (-2 / +2 lines)
1	MD5 (dmidecode-2.6.tar.bz2) = 16a31f6e70f6f1de864105c633e1a4c0	1	MD5 (dmidecode-2.7.tar.bz2) = 7aaf44ff2501cafc33634bbaa0d2af13
2	SIZE (dmidecode-2.6.tar.bz2) = 40215	2	SIZE (dmidecode-2.7.tar.bz2) = 44749




--- Makefile.orig	Wed Jun 15 22:22:35 2005
+++ Makefile	Thu Nov  3 07:05:13 2005
@@ -8,9 +8,8 @@
 #	Licensed under the GNU Public License.
 #
 
-CC      = gcc
-CFLAGS  = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
-          -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline
+CFLAGS+=	-W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+		-Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline
+          -DHAVE_DECL_GETOPT
 #CFLAGS += -DBIGENDIAN
 #CFLAGS += -DALIGNMENT_WORKAROUND
 
@@ -19,14 +18,14 @@
 #CFLAGS += -g
 
 # Pass linker flags here
-LDFLAGS =
+LDFLAGS+=
 
 DESTDIR =
-prefix  = /usr/local
+prefix  = $(PREFIX)
 sbindir = $(prefix)/sbin
-mandir  = $(prefix)/share/man
+mandir  = $(MANPREFIX)/man
 man8dir = $(mandir)/man8
-docdir  = $(prefix)/share/doc/dmidecode
+docdir  = $(DOCSDIR)
 
 INSTALL         := install
 INSTALL_DATA    := $(INSTALL) -m 644

Return to bug 88431

Lines 1-31 Link Here

(-)dmidecode/files/patch-Makefile (-14 / +16 lines)
1	--- Makefile.orig Mon Feb 28 21:43:00 2005	1	--- Makefile.orig Wed Jun 15 22:22:35 2005
2	+++ Makefile Sun Mar 20 22:16:32 2005	2	+++ Makefile Thu Nov 3 07:05:13 2005
3	@@ -8,9 +8,9 @@	3	@@ -8,9 +8,8 @@
4	# Licensed under the GNU Public License.	4	# Licensed under the GNU Public License.
5	#	5	#
6		6
7	-CC = gcc	7	-CC = gcc
8	-CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \	8	-CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
9	- -Wcast-align -Wwrite-strings -Wmissing-prototypes	9	- -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline
10	+CFLAGS += -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \	10	+CFLAGS+= -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
11	+ -Wcast-align -Wwrite-strings -Wmissing-prototypes ${CPPFLAGS} \	11	+ -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline
12	+ -DHAVE_DECL_GETOPT
13	#CFLAGS += -DBIGENDIAN	12	#CFLAGS += -DBIGENDIAN
14	#CFLAGS += -DALIGNMENT_WORKAROUND	13	#CFLAGS += -DALIGNMENT_WORKAROUND
15		14
16	@@ -19,12 +19,11 @@	15	@@ -19,14 +18,14 @@
17	#CFLAGS += -g	16	#CFLAGS += -g
18		17
19	# Pass linker flags here	18	# Pass linker flags here
20	-LDFLAGS =	19	-LDFLAGS =
21	+LDFLAGS +=	20	+LDFLAGS+=
22		21
23	DESTDIR =	22	DESTDIR =
24	-prefix = /usr/local	23	-prefix = /usr/local
25	-sbindir = $(prefix)/sbin	24	+prefix = $(PREFIX)
26	-mandir = $(prefix)/man	25	sbindir = $(prefix)/sbin
27	+sbindir = $(PREFIX)/sbin	26	-mandir = $(prefix)/share/man
28	+mandir = $(PREFIX)/man	27	+mandir = $(MANPREFIX)/man
29	man8dir = $(mandir)/man8	28	man8dir = $(mandir)/man8
		29	-docdir = $(prefix)/share/doc/dmidecode
		30	+docdir = $(DOCSDIR)
30		31
31	all : dmidecode biosdecode ownership vpddecode	32	INSTALL := install
		33	INSTALL_DATA := $(INSTALL) -m 644