summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2005-12-27 17:30:50 +0000
committerreed <reed@pkgsrc.org>2005-12-27 17:30:50 +0000
commit172c057f5a09e68812fa3e9e53e05cb199164dbe (patch)
treef2c6f99c07e66ff6547e14d75ac68d1b1b5bcd09
parent02cdfa0cd5fb59c8527edeac93f5769a0a9fe780 (diff)
downloadpkgsrc-172c057f5a09e68812fa3e9e53e05cb199164dbe.tar.gz
Add patch: the configure knows @mandir@ so make the Makefile use it.
And use PKGMANDIR for the INSTALLATION_DIRS. PKGREVISION not bumped -- no change in default build. And before would have failed if PKGMANDIR was set to non-default.
-rw-r--r--graphics/jpeg/Makefile4
-rw-r--r--graphics/jpeg/distinfo3
-rw-r--r--graphics/jpeg/patches/patch-aa13
3 files changed, 17 insertions, 3 deletions
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 6ffef777de6..b744916a7cb 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/04/11 21:46:05 tv Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/27 17:30:50 reed Exp $
#
DISTNAME= jpegsrc.v6b
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --enable-static
INSTALL_TARGET= install install-lib
-INSTALLATION_DIRS= bin lib include man/man1
+INSTALLATION_DIRS= bin lib include ${PKGMANDIR}/man1
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jpeg
diff --git a/graphics/jpeg/distinfo b/graphics/jpeg/distinfo
index d8676d0a02e..3ef3aa28c67 100644
--- a/graphics/jpeg/distinfo
+++ b/graphics/jpeg/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 08:45:08 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/12/27 17:30:50 reed Exp $
SHA1 (jpegsrc.v6b.tar.gz) = 7079f0d6c42fad0cfba382cf6ad322add1ace8f9
RMD160 (jpegsrc.v6b.tar.gz) = 18892206014fbb8cae2a44e281f4ed53feaf7882
Size (jpegsrc.v6b.tar.gz) = 613261 bytes
+SHA1 (patch-aa) = c328b9d8840749a8a9c57c28250bee223f7d79bf
diff --git a/graphics/jpeg/patches/patch-aa b/graphics/jpeg/patches/patch-aa
new file mode 100644
index 00000000000..36268798cb7
--- /dev/null
+++ b/graphics/jpeg/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.8 2005/12/27 17:30:50 reed Exp $
+
+--- makefile.cfg.orig 1998-03-21 11:08:57.000000000 -0800
++++ makefile.cfg
+@@ -17,7 +17,7 @@ includedir = $(prefix)/include
+ binprefix =
+ manprefix =
+ manext = 1
+-mandir = $(prefix)/man/man$(manext)
++mandir = @mandir@/man$(manext)
+
+ # The name of your C compiler:
+ CC= @CC@