Fri Jan 29 23:50:26 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.18 -r1.19 pkgsrc/graphics/wmphoto/Makefile
diff -r1.3 -r1.4 pkgsrc/graphics/wmphoto/distinfo
diff -r1.2 -r1.3 pkgsrc/graphics/wmphoto/patches/patch-aa
cvs diff -r1.18 -r1.19 pkgsrc/graphics/wmphoto/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/wmphoto/Makefile 2006/12/27 13:37:38 1.18
+++ pkgsrc/graphics/wmphoto/Makefile 2010/01/29 23:50:26 1.19
@@ -1,26 +1,29 @@ @@ -1,26 +1,29 @@
1# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:38 joerg Exp $ 1# $NetBSD: Makefile,v 1.19 2010/01/29 23:50:26 joerg Exp $
2# 2#
3 3
4DISTNAME= wmphoto-0.3a 4DISTNAME= wmphoto-0.3a
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://www.dcc.uchile.cl/~amartoq/wmphoto/ 7MASTER_SITES= http://www.dcc.uchile.cl/~amartoq/wmphoto/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.dcc.uchile.cl/~amartoq/wmphoto/ 10HOMEPAGE= http://www.dcc.uchile.cl/~amartoq/wmphoto/
11COMMENT= Dock-app that can show you a photo 11COMMENT= Dock-app that can show you a photo
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
13BUILD_DIRS= wmphoto 15BUILD_DIRS= wmphoto
14USE_X11BASE= YES 16USE_X11BASE= YES
15USE_TOOLS+= gmake 17USE_TOOLS+= gmake
16MAKE_ENV+= X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q} 18MAKE_ENV+= X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q}
17 19
 20INSTALLATION_DIRS+= bin share/doc/wmphoto
 21
18post-install: 22post-install:
19 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmphoto 23 ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/HINTS \
20 ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmphoto 24 ${DESTDIR}${PREFIX}/share/doc/wmphoto
21 ${INSTALL_DATA} ${WRKSRC}/HINTS ${PREFIX}/share/doc/wmphoto 
22 25
23.include "../../x11/libXext/buildlink3.mk" 26.include "../../x11/libXext/buildlink3.mk"
24.include "../../x11/libXpm/buildlink3.mk" 27.include "../../x11/libXpm/buildlink3.mk"
25.include "../../x11/xextproto/buildlink3.mk" 28.include "../../x11/xextproto/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/graphics/wmphoto/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/wmphoto/distinfo 2005/11/03 22:12:36 1.3
+++ pkgsrc/graphics/wmphoto/distinfo 2010/01/29 23:50:26 1.4
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.3 2005/11/03 22:12:36 rillig Exp $ 1$NetBSD: distinfo,v 1.4 2010/01/29 23:50:26 joerg Exp $
2 2
3SHA1 (wmphoto-0.3a.tar.gz) = dbec1ddd49671bc915b6e9ce37462247557f7fb9 3SHA1 (wmphoto-0.3a.tar.gz) = dbec1ddd49671bc915b6e9ce37462247557f7fb9
4RMD160 (wmphoto-0.3a.tar.gz) = 64b0006b90d187ec01da32f1bc9b7607d19f4330 4RMD160 (wmphoto-0.3a.tar.gz) = 64b0006b90d187ec01da32f1bc9b7607d19f4330
5Size (wmphoto-0.3a.tar.gz) = 19320 bytes 5Size (wmphoto-0.3a.tar.gz) = 19320 bytes
6SHA1 (patch-aa) = 952c53a00cb6a73e4b780e9d643144c394c7d6af 6SHA1 (patch-aa) = fc65409f609cf4484abf13a72437dd8e7fe77e5b
cvs diff -r1.2 -r1.3 pkgsrc/graphics/wmphoto/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/wmphoto/patches/patch-aa 2005/11/03 22:12:36 1.2
+++ pkgsrc/graphics/wmphoto/patches/patch-aa 2010/01/29 23:50:26 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.2 2005/11/03 22:12:36 rillig Exp $ 1$NetBSD: patch-aa,v 1.3 2010/01/29 23:50:26 joerg Exp $
2 2
3--- wmphoto/Makefile.orig Wed Mar 28 10:09:18 2001 3--- wmphoto/Makefile.orig Wed Mar 28 10:09:18 2001
4+++ wmphoto/Makefile Wed Mar 28 10:15:59 2001 4+++ wmphoto/Makefile Wed Mar 28 10:15:59 2001
5@@ -1,19 +1,8 @@ 5@@ -1,19 +1,8 @@
6 # wmphoto Makefile 6 # wmphoto Makefile
7  7
8-# directory where to install it. 8-# directory where to install it.
9-INSTALL = /usr/local/bin 9-INSTALL = /usr/local/bin
10- 10-
11-# RedHat Linux 5.2 11-# RedHat Linux 5.2
12-CC = gcc 12-CC = gcc
13-CCOPTIONS = -O2 -Wall 13-CCOPTIONS = -O2 -Wall
14-LIBDIR = -L/usr/X11R6/lib 14-LIBDIR = -L/usr/X11R6/lib
@@ -30,17 +30,17 @@ $NetBSD: patch-aa,v 1.2 2005/11/03 22:12 @@ -30,17 +30,17 @@ $NetBSD: patch-aa,v 1.2 2005/11/03 22:12
30 .c.o: 30 .c.o:
31- $(CC) -c $(CCOPTIONS) $< -o $*.o 31- $(CC) -c $(CCOPTIONS) $< -o $*.o
32+ ${CC} -c ${CFLAGS} $< -o $*.o 32+ ${CC} -c ${CFLAGS} $< -o $*.o
33  33
34 $(APP): $(OBJS) 34 $(APP): $(OBJS)
35- $(CC) -o $(APP) $^ $(LIBDIR) $(LIBS) 35- $(CC) -o $(APP) $^ $(LIBDIR) $(LIBS)
36+ ${CC} -o $(APP) $^ $(LIBDIR) $(LIBS) 36+ ${CC} -o $(APP) $^ $(LIBDIR) $(LIBS)
37  37
38 install: $(APP) 38 install: $(APP)
39- strip $(APP) 39- strip $(APP)
40- cp $(APP) $(INSTALL) 40- cp $(APP) $(INSTALL)
41- chown root.root $(APP) 41- chown root.root $(APP)
42- chmod 755 $(APP) 42- chmod 755 $(APP)
43+ install -s -c $(APP) ${X11PREFIX}/bin 43+ ${BSD_INSTALL_PROGRAM} $(APP) ${DESTDIR}${X11PREFIX}/bin
44  44
45 clean:: 45 clean::
46 for i in $(OBJS) ; do \ 46 for i in $(OBJS) ; do \