Thu Oct 29 22:34:33 2009 UTC ()
Support DESTDIR and PKGMANDIR


(tnn)
diff -r1.6 -r1.7 pkgsrc/graphics/ljpeg/Makefile
diff -r1.3 -r1.4 pkgsrc/graphics/ljpeg/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/ljpeg/patches/patch-aa
cvs diff -r1.6 -r1.7 pkgsrc/graphics/ljpeg/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ljpeg/Makefile 2006/06/15 13:31:29 1.6
+++ pkgsrc/graphics/ljpeg/Makefile 2009/10/29 22:34:33 1.7
@@ -1,26 +1,29 @@ @@ -1,26 +1,29 @@
1# $NetBSD: Makefile,v 1.6 2006/06/15 13:31:29 wiz Exp $ 1# $NetBSD: Makefile,v 1.7 2009/10/29 22:34:33 tnn Exp $
2# 2#
3 3
4DISTNAME= ljpg 4DISTNAME= ljpg
5PKGNAME= ljpg-1.0 5PKGNAME= ljpg-1.0
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= ftp://ftp.cs.cornell.edu/pub/multimed/ 7MASTER_SITES= ftp://ftp.cs.cornell.edu/pub/multimed/
8EXTRACT_SUFX= .tar.Z 8EXTRACT_SUFX= .tar.Z
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= ftp://ftp.cs.cornell.edu/pub/multimed/ 11HOMEPAGE= ftp://ftp.cs.cornell.edu/pub/multimed/
12COMMENT= Lossless JPEG codec 12COMMENT= Lossless JPEG codec
13 13
 14PKG_DESTDIR_SUPPORT= user-destdir
 15
14WRKSRC= ${WRKDIR} 16WRKSRC= ${WRKDIR}
15DIST_SUBDIR= ${PKGNAME_NOREV} 17DIST_SUBDIR= ${PKGNAME_NOREV}
16 18
17BUILD_TARGET= default 19BUILD_TARGET= default
18 20
 21INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 \
 22 share/doc/ljpeg share/examples/ljpeg
 23
19post-install: 24post-install:
20 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ljpeg 25 ${INSTALL_DATA} ${WRKSRC}/Copyright ${DESTDIR}${PREFIX}/share/doc/ljpeg
21 ${INSTALL_DATA} ${WRKSRC}/Copyright ${PREFIX}/share/doc/ljpeg 26 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/ljpeg
22 ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ljpeg 27 ${INSTALL_DATA} ${WRKSRC}/F-18* ${DESTDIR}${PREFIX}/share/examples/ljpeg
23 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ljpeg 
24 ${INSTALL_DATA} ${WRKSRC}/F-18* ${PREFIX}/share/examples/ljpeg 
25 28
26.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/graphics/ljpeg/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/ljpeg/distinfo 2005/02/24 08:45:10 1.3
+++ pkgsrc/graphics/ljpeg/distinfo 2009/10/29 22:34:33 1.4
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2005/02/24 08:45:10 agc Exp $ 1$NetBSD: distinfo,v 1.4 2009/10/29 22:34:33 tnn Exp $
2 2
3SHA1 (ljpg-1.0/ljpg.tar.Z) = 47071fad1f11a3b9241a34b188ab07d54dcd13bc 3SHA1 (ljpg-1.0/ljpg.tar.Z) = 47071fad1f11a3b9241a34b188ab07d54dcd13bc
4RMD160 (ljpg-1.0/ljpg.tar.Z) = c61e5207ebf449e016ea9e2f23c54d323f680a54 4RMD160 (ljpg-1.0/ljpg.tar.Z) = c61e5207ebf449e016ea9e2f23c54d323f680a54
5Size (ljpg-1.0/ljpg.tar.Z) = 334459 bytes 5Size (ljpg-1.0/ljpg.tar.Z) = 334459 bytes
6SHA1 (patch-aa) = 562ce4a8f82c6ed59b4b730f59822d4749e925a3 6SHA1 (patch-aa) = ceb910a141d782597d2d3dbb15b520e6284cb394
7SHA1 (patch-ab) = c56ad99b8ce278d58f50fc8770c6ca62aa8936f4 7SHA1 (patch-ab) = c56ad99b8ce278d58f50fc8770c6ca62aa8936f4
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/ljpeg/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/ljpeg/patches/patch-aa 2003/12/21 21:30:14 1.1.1.1
+++ pkgsrc/graphics/ljpeg/patches/patch-aa 2009/10/29 22:34:33 1.2
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: patch-aa,v 1.1.1.1 2003/12/21 21:30:14 wiz Exp $ 1$NetBSD: patch-aa,v 1.2 2009/10/29 22:34:33 tnn Exp $
2 2
3--- Makefile.orig Wed Jun 22 18:48:40 1994 3--- Makefile.orig 1994-06-22 18:48:40.000000000 +0200
4+++ Makefile 4+++ Makefile
5@@ -1,19 +1,19 @@ 5@@ -1,19 +1,19 @@
6 # 6 #
7 # Set BINDIR to where you want the binaries to go. 7 # Set BINDIR to where you want the binaries to go.
8 # 8 #
9-BINDIR= /usr/public/sun4/bin 9-BINDIR= /usr/public/sun4/bin
10+BINDIR= ${PREFIX}/bin 10+BINDIR= ${DESTDIR}${PREFIX}/bin
11  11
12 # 12 #
13 # Set MANDIR to where you want the man pages to go. 13 # Set MANDIR to where you want the man pages to go.
14 # 14 #
15-MANDIR= /usr/public/share/man/man1 15-MANDIR= /usr/public/share/man/man1
16+MANDIR= ${PREFIX}/man/man1 16+MANDIR= ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
17  17
18 # 18 #
19 # Select your favorite compiler and compilation flags here. 19 # Select your favorite compiler and compilation flags here.
20 # 20 #
21 #CC = cc 21 #CC = cc
22-CC = gcc 22-CC = gcc
23-CFLAGS= -I. -O2 23-CFLAGS= -I. -O2
24+#CC = gcc 24+#CC = gcc
25+CFLAGS+= -I. 25+CFLAGS+= -I.
26 #CFLAGS= +O3 -I. 26 #CFLAGS= +O3 -I.
27 #CFLAGS= -O2 -DDEBUG 27 #CFLAGS= -O2 -DDEBUG
28  28
29@@ -36,12 +36,8 @@ ljpgtopnm: $(DECODE_OBJ) 29@@ -36,12 +36,8 @@ ljpgtopnm: $(DECODE_OBJ)