Attachment #76912 for bug #110806

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

Lines 7-12 Link Here

(-)Makefile (+1 lines)
7		7
8	PORTNAME= smartmontools	8	PORTNAME= smartmontools
9	PORTVERSION= 5.37	9	PORTVERSION= 5.37
		10	PORTREVISION= 1
10	CATEGORIES= sysutils	11	CATEGORIES= sysutils
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}

Added Link Here

(-)files/patch-knowndrives.cpp (+14 lines)
1
2	$FreeBSD$
3
4	--- knowndrives.cpp.orig
5	+++ knowndrives.cpp
6	@@ -1031,7 +1031,7 @@
7	NULL, NULL, NULL, NULL
8	},
9	{ "Western Digital Caviar SE (Serial ATA) family",
10	- "^WDC WD((4\|8\|12\|16\|20\|25\|32)00JD\|(12\|16\|20\|25\|30\|32)00JS\|1600AAJS)-.*$",
11	+ "^WDC WD((4\|8\|12\|16\|20\|25\|32)00[JP]D\|(12\|16\|20\|25\|30\|32)00JS\|1600AAJS)-.*$",
12	".*",
13	NULL, NULL, NULL, NULL
14	},





$FreeBSD$

--- os_freebsd.cpp.orig
+++ os_freebsd.cpp
@@ -1008,7 +1008,7 @@
   // to first list. Turn on NOCHECK for second call. This results in no
   // error if no more matches found, however it does append the actual
   // pattern to the list of paths....
-  if ((retglob=glob(pattern1, GLOB_ERR, NULL, &globbuf)) ||
+  if ((retglob=glob(pattern1, GLOB_ERR|GLOB_NOCHECK, NULL, &globbuf)) ||
       (retglob=glob(pattern2, GLOB_ERR|GLOB_APPEND|GLOB_NOCHECK,NULL,&globbuf))) {
      int retval = -1;
     // glob failed

Return to bug 110806

Added Link Here

(-)files/patch-os__freebsd.cpp (+14 lines)
1
2	$FreeBSD$
3
4	--- os_freebsd.cpp.orig
5	+++ os_freebsd.cpp
6	@@ -1008,7 +1008,7 @@
7	// to first list. Turn on NOCHECK for second call. This results in no
8	// error if no more matches found, however it does append the actual
9	// pattern to the list of paths....
10	- if ((retglob=glob(pattern1, GLOB_ERR, NULL, &globbuf)) \|\|
11	+ if ((retglob=glob(pattern1, GLOB_ERR\|GLOB_NOCHECK, NULL, &globbuf)) \|\|
12	(retglob=glob(pattern2, GLOB_ERR\|GLOB_APPEND\|GLOB_NOCHECK,NULL,&globbuf))) {
13	int retval = -1;
14	// glob failed