Attachment #62082 for bug #92894

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

Lines 6-12 Link Here

(-)dmidecode/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= dmidecode	8	PORTNAME= dmidecode
9	PORTVERSION= 2.7	9	PORTVERSION= 2.8
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-24 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	USE_REINPLACE= yes
22	USE_GETOPT_LONG= yes	21	USE_GETOPT_LONG= yes
23	MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" DOCSDIR="${DOCSDIR}"	22	MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" DOCSDIR="${DOCSDIR}"
24		23

Lines 1-3 Link Here

(-)dmidecode/distinfo (-3 / +3 lines)
1	MD5 (dmidecode-2.7.tar.bz2) = 7aaf44ff2501cafc33634bbaa0d2af13	1	MD5 (dmidecode-2.8.tar.bz2) = 72dc651f1d6e9d7571d0117b16987edf
2	SHA256 (dmidecode-2.7.tar.bz2) = e771ceca4fbca9ccdc8ace7e60381dee724e6812dbc52568d58a54d91e954f04	2	SHA256 (dmidecode-2.8.tar.bz2) = 8137e69eb4bcf52b3bfa6d4cf580d6a29cd6177e5e47b43a2640d6f3912c53ae
3	SIZE (dmidecode-2.7.tar.bz2) = 44749	3	SIZE (dmidecode-2.8.tar.bz2) = 46791




--- Makefile.orig	Mon Oct  3 22:38:20 2005
+++ Makefile	Mon Feb  6 17:42:19 2006
@@ -8,25 +8,26 @@
 #	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 -Wundef
+
+CFLAGS+=       -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+               -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline
+CFLAGS+=       ${CPPFLAGS}
 #CFLAGS += -DBIGENDIAN
 #CFLAGS += -DALIGNMENT_WORKAROUND
 

 
 DESTDIR =
-prefix  = /usr/local
-sbindir = $(prefix)/sbin
 sbindir = $(prefix)/sbin
-mandir  = $(prefix)/share/man
-man8dir = $(mandir)/man8
 man8dir = $(mandir)/man8
-docdir  = $(prefix)/share/doc/dmidecode
+prefix  = $(PREFIX)
+sbindir = $(PREFIX)/sbin
+mandir  = $(MANPREFIX)/man
+man8dir = $(MANPREFIX)/man/man8
+docdir  = $(DOCSDIR)/
 
 INSTALL         := install
 INSTALL_DATA    := $(INSTALL) -m 644

Return to bug 92894

Lines 1-15 Link Here

(-)dmidecode/files/patch-Makefile (-12 / +15 lines)
1	--- Makefile.orig Wed Jun 15 20:22:35 2005	1	--- Makefile.orig Mon Oct 3 22:38:20 2005
2	+++ Makefile Fri Nov 25 20:31:58 2005	2	+++ Makefile Mon Feb 6 17:42:19 2006
3	@@ -8,25 +8,25 @@	3	@@ -8,25 +8,26 @@
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 -Winline	9	- -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
10	+CFLAGS+= -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \	10	+
11	+ -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline	11	+CFLAGS+= -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
12	+CFLAGS+= ${CPPFLAGS}	12	+ -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline
		13	+CFLAGS+= ${CPPFLAGS}
13	#CFLAGS += -DBIGENDIAN	14	#CFLAGS += -DBIGENDIAN
14	#CFLAGS += -DALIGNMENT_WORKAROUND	15	#CFLAGS += -DALIGNMENT_WORKAROUND
15		16
Lines 24-36 Link Here
24		25
25	DESTDIR =	26	DESTDIR =
26	-prefix = /usr/local	27	-prefix = /usr/local
27	+prefix = $(PREFIX)	28	-sbindir = $(prefix)/sbin
28	sbindir = $(prefix)/sbin
29	-mandir = $(prefix)/share/man	29	-mandir = $(prefix)/share/man
30	+mandir = $(MANPREFIX)/man	30	-man8dir = $(mandir)/man8
31	man8dir = $(mandir)/man8
32	-docdir = $(prefix)/share/doc/dmidecode	31	-docdir = $(prefix)/share/doc/dmidecode
33	+docdir = $(DOCSDIR)	32	+prefix = $(PREFIX)
		33	+sbindir = $(PREFIX)/sbin
		34	+mandir = $(MANPREFIX)/man
		35	+man8dir = $(MANPREFIX)/man/man8
		36	+docdir = $(DOCSDIR)/
34		37
35	INSTALL := install	38	INSTALL := install
36	INSTALL_DATA := $(INSTALL) -m 644	39	INSTALL_DATA := $(INSTALL) -m 644