summaryrefslogtreecommitdiff
path: root/textproc/mdocml
diff options
context:
space:
mode:
authorjperkin <jperkin>2012-12-24 13:40:18 +0000
committerjperkin <jperkin>2012-12-24 13:40:18 +0000
commit77512c3e22d6efeacc32822cd91f526d1a891da7 (patch)
tree725ded49a3a3644ca9391df6f23c581f42f2ac52 /textproc/mdocml
parentea97740358be009e670cec4ee132e8c1c72196f6 (diff)
downloadpkgsrc-77512c3e22d6efeacc32822cd91f526d1a891da7.tar.gz
Make patches generic to Solaris. If changes are necessary for versions
prior to Solaris 11 then we can handle them later.
Diffstat (limited to 'textproc/mdocml')
-rw-r--r--textproc/mdocml/Makefile8
-rw-r--r--textproc/mdocml/distinfo6
-rw-r--r--textproc/mdocml/patches/patch-apropos.c4
-rw-r--r--textproc/mdocml/patches/patch-mandocdb.c4
4 files changed, 8 insertions, 14 deletions
diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index c7577c6b4ad..206eb483e84 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2012/12/24 12:53:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.34 2012/12/24 13:40:18 jperkin Exp $
DISTNAME= mdocml-1.12.0
PKGREVISION= 2
@@ -14,11 +14,5 @@ MAKE_FLAGS+= PREFIX=${PREFIX} DBLIB=${BDB_LIBS:Q}
CONFLICTS= man-pages-[0-9]* groff-[0-9]*
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OS_VARIANT} == "SmartOS"
-CFLAGS+= -D__SmartOS__
-.endif
-
.include "../../mk/bdb.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/mdocml/distinfo b/textproc/mdocml/distinfo
index 40cfcf70ff5..48fd0334159 100644
--- a/textproc/mdocml/distinfo
+++ b/textproc/mdocml/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.25 2012/12/24 12:53:17 ryoon Exp $
+$NetBSD: distinfo,v 1.26 2012/12/24 13:40:18 jperkin Exp $
SHA1 (mdocml-1.12.0.tar.gz) = 7c2c1a23c0bba61d9fc4ee7dc5b47a0a07e0b981
RMD160 (mdocml-1.12.0.tar.gz) = 3ea04c4b4639ae63ae924db3645f1712f149ec5b
Size (mdocml-1.12.0.tar.gz) = 236717 bytes
-SHA1 (patch-apropos.c) = 8c219b5b1c61dc49d71f0a4207e8480f5aa79099
-SHA1 (patch-mandocdb.c) = 325d80259553fc223b8f8e4c1a3949f127c74cae
+SHA1 (patch-apropos.c) = 7f87b36a20a6682a922e1c1ee7ca144be7f020ab
+SHA1 (patch-mandocdb.c) = 2a0d1aacd3d8c2411e7d067df08151d57afae7ab
diff --git a/textproc/mdocml/patches/patch-apropos.c b/textproc/mdocml/patches/patch-apropos.c
index 59159389545..38744678bbf 100644
--- a/textproc/mdocml/patches/patch-apropos.c
+++ b/textproc/mdocml/patches/patch-apropos.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-apropos.c,v 1.1 2012/12/24 12:53:17 ryoon Exp $
+$NetBSD: patch-apropos.c,v 1.2 2012/12/24 13:40:18 jperkin Exp $
--- apropos.c.orig 2011-10-08 20:07:21.000000000 +0000
+++ apropos.c
@@ -7,7 +7,7 @@ $NetBSD: patch-apropos.c,v 1.1 2012/12/24 12:53:17 ryoon Exp $
#include <unistd.h>
-#ifdef __linux__
-+#if defined(__linux__) || defined(__SmartOS__)
++#if defined(__linux__) || defined(__sun)
# include <db_185.h>
#else
# include <db.h>
diff --git a/textproc/mdocml/patches/patch-mandocdb.c b/textproc/mdocml/patches/patch-mandocdb.c
index 4254ccf0a7c..4ad582c6b86 100644
--- a/textproc/mdocml/patches/patch-mandocdb.c
+++ b/textproc/mdocml/patches/patch-mandocdb.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-mandocdb.c,v 1.1 2012/12/24 12:53:17 ryoon Exp $
+$NetBSD: patch-mandocdb.c,v 1.2 2012/12/24 13:40:18 jperkin Exp $
--- mandocdb.c.orig 2011-10-08 20:07:22.000000000 +0000
+++ mandocdb.c
@@ -7,7 +7,7 @@ $NetBSD: patch-mandocdb.c,v 1.1 2012/12/24 12:53:17 ryoon Exp $
#include <string.h>
-#ifdef __linux__
-+#if defined(__linux__) || defined(__SmartOS__)
++#if defined(__linux__) || defined(__sun)
# include <db_185.h>
#else
# include <db.h>