move documentation to a better location, bump PKGREV

4 files changed, 30 insertions, 10 deletions

diff --git a/graphics/libjpeg-turbo/Makefile b/graphics/libjpeg-turbo/Makefile
index 85fde955b80..173eedff12d 100644
--- a/graphics/libjpeg-turbo/Makefile
+++ b/graphics/libjpeg-turbo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2012/08/01 15:43:03 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/04 13:42:21 drochner Exp $
 #
 
 DISTNAME=	libjpeg-turbo-1.2.1
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/}
 
diff --git a/graphics/libjpeg-turbo/PLIST b/graphics/libjpeg-turbo/PLIST
index 3d778a2e1bf..b970e3cbb3c 100644
--- a/graphics/libjpeg-turbo/PLIST
+++ b/graphics/libjpeg-turbo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/08/01 15:43:03 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/08/04 13:42:21 drochner Exp $
 bin/cjpeg
 bin/djpeg
 bin/jpegtran
@@ -17,10 +17,10 @@ man/man1/djpeg.1
 man/man1/jpegtran.1
 man/man1/rdjpgcom.1
 man/man1/wrjpgcom.1
-share/doc/README
-share/doc/README-turbo.txt
-share/doc/example.c
-share/doc/libjpeg.txt
-share/doc/structure.txt
-share/doc/usage.txt
-share/doc/wizard.txt
+share/doc/libjpeg-turbo/README
+share/doc/libjpeg-turbo/README-turbo.txt
+share/doc/libjpeg-turbo/example.c
+share/doc/libjpeg-turbo/libjpeg.txt
+share/doc/libjpeg-turbo/structure.txt
+share/doc/libjpeg-turbo/usage.txt
+share/doc/libjpeg-turbo/wizard.txt
diff --git a/graphics/libjpeg-turbo/distinfo b/graphics/libjpeg-turbo/distinfo
index 701cf759dd5..a5a925d84d9 100644
--- a/graphics/libjpeg-turbo/distinfo
+++ b/graphics/libjpeg-turbo/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2012/08/01 15:43:03 drochner Exp $
+$NetBSD: distinfo,v 1.5 2012/08/04 13:42:21 drochner Exp $
 
 SHA1 (libjpeg-turbo-1.2.1.tar.gz) = a4992e102c6d88146709e8e6ce5896d5d0b5a361
 RMD160 (libjpeg-turbo-1.2.1.tar.gz) = 2298b1a919018695fa4a9851dac3e50443235196
 Size (libjpeg-turbo-1.2.1.tar.gz) = 1755264 bytes
+SHA1 (patch-aa) = c6523f2aae1c440f3a7b572b45f164ae88a14776
 SHA1 (patch-configure) = aa16d166989dafec06ba2c982316f6dfa473df90
diff --git a/graphics/libjpeg-turbo/patches/patch-aa b/graphics/libjpeg-turbo/patches/patch-aa
new file mode 100644
index 00000000000..b751accaf16
--- /dev/null
+++ b/graphics/libjpeg-turbo/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.1 2012/08/04 13:42:22 drochner Exp $
+
+--- Makefile.in.orig	2012-06-29 23:52:27.000000000 +0000
++++ Makefile.in
+@@ -462,11 +462,11 @@ dist_man1_MANS = cjpeg.1 djpeg.1 jpegtra
+ DOCS = install.txt coderules.txt filelist.txt jconfig.txt change.log \
+ 	rdrle.c wrrle.c BUILDING.txt ChangeLog.txt
+ 
+-docdir = $(datadir)/doc
++docdir = $(datadir)/doc/libjpeg-turbo
+ dist_doc_DATA = README README-turbo.txt libjpeg.txt structure.txt usage.txt \
+ 	wizard.txt 
+ 
+-exampledir = $(datadir)/doc
++exampledir = $(datadir)/doc/libjpeg-turbo
+ dist_example_DATA = example.c
+ EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \
+ 	sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \