Mon Dec 24 13:40:18 2012 UTC ()
Make patches generic to Solaris.  If changes are necessary for versions
prior to Solaris 11 then we can handle them later.


(jperkin)
diff -r1.33 -r1.34 pkgsrc/textproc/mdocml/Makefile
diff -r1.25 -r1.26 pkgsrc/textproc/mdocml/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/mdocml/patches/patch-apropos.c
diff -r1.1 -r1.2 pkgsrc/textproc/mdocml/patches/patch-mandocdb.c
cvs diff -r1.33 -r1.34 pkgsrc/textproc/mdocml/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/mdocml/Attic/Makefile 2012/12/24 12:53:17 1.33
+++ pkgsrc/textproc/mdocml/Attic/Makefile 2012/12/24 13:40:18 1.34
@@ -1,24 +1,18 @@ @@ -1,24 +1,18 @@
1# $NetBSD: Makefile,v 1.33 2012/12/24 12:53:17 ryoon Exp $ 1# $NetBSD: Makefile,v 1.34 2012/12/24 13:40:18 jperkin Exp $
2 2
3DISTNAME= mdocml-1.12.0 3DISTNAME= mdocml-1.12.0
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= textproc devel 5CATEGORIES= textproc devel
6MASTER_SITES= http://mdocml.bsd.lv/snapshots/ 6MASTER_SITES= http://mdocml.bsd.lv/snapshots/
7 7
8MAINTAINER= kristaps@kth.se 8MAINTAINER= kristaps@kth.se
9HOMEPAGE= http://mdocml.bsd.lv/ 9HOMEPAGE= http://mdocml.bsd.lv/
10COMMENT= Man page tool (mdoc macro compiler) 10COMMENT= Man page tool (mdoc macro compiler)
11LICENSE= 2-clause-bsd # not exactly, but near enough 11LICENSE= 2-clause-bsd # not exactly, but near enough
12 12
13MAKE_FLAGS+= PREFIX=${PREFIX} DBLIB=${BDB_LIBS:Q} 13MAKE_FLAGS+= PREFIX=${PREFIX} DBLIB=${BDB_LIBS:Q}
14 14
15CONFLICTS= man-pages-[0-9]* groff-[0-9]* 15CONFLICTS= man-pages-[0-9]* groff-[0-9]*
16 16
17.include "../../mk/bsd.prefs.mk" 
18 
19.if ${OS_VARIANT} == "SmartOS" 
20CFLAGS+= -D__SmartOS__ 
21.endif 
22 
23.include "../../mk/bdb.buildlink3.mk" 17.include "../../mk/bdb.buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/textproc/mdocml/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/mdocml/Attic/distinfo 2012/12/24 12:53:17 1.25
+++ pkgsrc/textproc/mdocml/Attic/distinfo 2012/12/24 13:40:18 1.26
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.25 2012/12/24 12:53:17 ryoon Exp $ 1$NetBSD: distinfo,v 1.26 2012/12/24 13:40:18 jperkin Exp $
2 2
3SHA1 (mdocml-1.12.0.tar.gz) = 7c2c1a23c0bba61d9fc4ee7dc5b47a0a07e0b981 3SHA1 (mdocml-1.12.0.tar.gz) = 7c2c1a23c0bba61d9fc4ee7dc5b47a0a07e0b981
4RMD160 (mdocml-1.12.0.tar.gz) = 3ea04c4b4639ae63ae924db3645f1712f149ec5b 4RMD160 (mdocml-1.12.0.tar.gz) = 3ea04c4b4639ae63ae924db3645f1712f149ec5b
5Size (mdocml-1.12.0.tar.gz) = 236717 bytes 5Size (mdocml-1.12.0.tar.gz) = 236717 bytes
6SHA1 (patch-apropos.c) = 8c219b5b1c61dc49d71f0a4207e8480f5aa79099 6SHA1 (patch-apropos.c) = 7f87b36a20a6682a922e1c1ee7ca144be7f020ab
7SHA1 (patch-mandocdb.c) = 325d80259553fc223b8f8e4c1a3949f127c74cae 7SHA1 (patch-mandocdb.c) = 2a0d1aacd3d8c2411e7d067df08151d57afae7ab
cvs diff -r1.1 -r1.2 pkgsrc/textproc/mdocml/patches/Attic/patch-apropos.c (expand / switch to unified diff)

--- pkgsrc/textproc/mdocml/patches/Attic/patch-apropos.c 2012/12/24 12:53:17 1.1
+++ pkgsrc/textproc/mdocml/patches/Attic/patch-apropos.c 2012/12/24 13:40:18 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-apropos.c,v 1.1 2012/12/24 12:53:17 ryoon Exp $ 1$NetBSD: patch-apropos.c,v 1.2 2012/12/24 13:40:18 jperkin Exp $
2 2
3--- apropos.c.orig 2011-10-08 20:07:21.000000000 +0000 3--- apropos.c.orig 2011-10-08 20:07:21.000000000 +0000
4+++ apropos.c 4+++ apropos.c
5@@ -33,7 +33,7 @@ 5@@ -33,7 +33,7 @@
6 #include <string.h> 6 #include <string.h>
7 #include <unistd.h> 7 #include <unistd.h>
8  8
9-#ifdef __linux__ 9-#ifdef __linux__
10+#if defined(__linux__) || defined(__SmartOS__) 10+#if defined(__linux__) || defined(__sun)
11 # include <db_185.h> 11 # include <db_185.h>
12 #else 12 #else
13 # include <db.h> 13 # include <db.h>
cvs diff -r1.1 -r1.2 pkgsrc/textproc/mdocml/patches/Attic/patch-mandocdb.c (expand / switch to unified diff)

--- pkgsrc/textproc/mdocml/patches/Attic/patch-mandocdb.c 2012/12/24 12:53:17 1.1
+++ pkgsrc/textproc/mdocml/patches/Attic/patch-mandocdb.c 2012/12/24 13:40:18 1.2
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-mandocdb.c,v 1.1 2012/12/24 12:53:17 ryoon Exp $ 1$NetBSD: patch-mandocdb.c,v 1.2 2012/12/24 13:40:18 jperkin Exp $
2 2
3--- mandocdb.c.orig 2011-10-08 20:07:22.000000000 +0000 3--- mandocdb.c.orig 2011-10-08 20:07:22.000000000 +0000
4+++ mandocdb.c 4+++ mandocdb.c
5@@ -29,12 +29,16 @@ 5@@ -29,12 +29,16 @@
6 #include <stdlib.h> 6 #include <stdlib.h>
7 #include <string.h> 7 #include <string.h>
8  8
9-#ifdef __linux__ 9-#ifdef __linux__
10+#if defined(__linux__) || defined(__SmartOS__) 10+#if defined(__linux__) || defined(__sun)
11 # include <db_185.h> 11 # include <db_185.h>
12 #else 12 #else
13 # include <db.h> 13 # include <db.h>
14 #endif 14 #endif
15  15
16+#if defined(__sun) 16+#if defined(__sun)
17+# include <sys/stat.h> 17+# include <sys/stat.h>
18+#endif 18+#endif
19+ 19+
20 #include "man.h" 20 #include "man.h"
21 #include "mdoc.h" 21 #include "mdoc.h"
22 #include "mandoc.h" 22 #include "mandoc.h"
23@@ -1223,7 +1227,15 @@ ofile_dirbuild(const char *dir, int verb 23@@ -1223,7 +1227,15 @@ ofile_dirbuild(const char *dir, int verb