Fri Feb 12 00:28:36 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.18 -r1.19 pkgsrc/time/wmmoonclock/Makefile
diff -r1.5 -r1.6 pkgsrc/time/wmmoonclock/distinfo
diff -r1.3 -r1.4 pkgsrc/time/wmmoonclock/patches/patch-aa
cvs diff -r1.18 -r1.19 pkgsrc/time/wmmoonclock/Makefile (expand / switch to unified diff)

--- pkgsrc/time/wmmoonclock/Makefile 2007/09/19 06:46:52 1.18
+++ pkgsrc/time/wmmoonclock/Makefile 2010/02/12 00:28:36 1.19
@@ -1,27 +1,31 @@ @@ -1,27 +1,31 @@
1# $NetBSD: Makefile,v 1.18 2007/09/19 06:46:52 tron Exp $ 1# $NetBSD: Makefile,v 1.19 2010/02/12 00:28:36 joerg Exp $
2 2
3DISTNAME= wmMoonClock-1.27 3DISTNAME= wmMoonClock-1.27
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= x11 time 5CATEGORIES= x11 time
6MASTER_SITES= http://reality.sgiweb.org/freeware/source/wmMoonClock/ 6MASTER_SITES= http://reality.sgiweb.org/freeware/source/wmMoonClock/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9# HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml 9# HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
10COMMENT= Shows lunar ephemeris to fairly high accuracy 10COMMENT= Shows lunar ephemeris to fairly high accuracy
11 11
 12PKG_DESTDIR_SUPPORT= user-destdir
 13
12WRKSRC= ${WRKDIR}/${DISTNAME}/Src 14WRKSRC= ${WRKDIR}/${DISTNAME}/Src
13USE_TOOLS+= gmake 15USE_TOOLS+= gmake
14USE_X11BASE= YES 16USE_X11BASE= YES
15 17
16MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q} 18MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
17 19
18.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
19 21
20.if ${OPSYS} == "SunOS" 22.if ${OPSYS} == "SunOS"
21EXTRA_LOCAL_LIBS= -lsocket 23EXTRA_LOCAL_LIBS= -lsocket
22.endif 24.endif
23 25
 26INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
 27
24.include "../../x11/libXext/buildlink3.mk" 28.include "../../x11/libXext/buildlink3.mk"
25.include "../../x11/libXpm/buildlink3.mk" 29.include "../../x11/libXpm/buildlink3.mk"
26.include "../../x11/xextproto/buildlink3.mk" 30.include "../../x11/xextproto/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/time/wmmoonclock/distinfo (expand / switch to unified diff)

--- pkgsrc/time/wmmoonclock/distinfo 2005/02/23 19:14:56 1.5
+++ pkgsrc/time/wmmoonclock/distinfo 2010/02/12 00:28:36 1.6
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.5 2005/02/23 19:14:56 wiz Exp $ 1$NetBSD: distinfo,v 1.6 2010/02/12 00:28:36 joerg Exp $
2 2
3SHA1 (wmMoonClock-1.27.tar.gz) = bbc27a11ff99505fe4b872019f214f305cee6c5b 3SHA1 (wmMoonClock-1.27.tar.gz) = bbc27a11ff99505fe4b872019f214f305cee6c5b
4RMD160 (wmMoonClock-1.27.tar.gz) = adf74a0fff42a5e3d7823c7fabf71c95f47057e4 4RMD160 (wmMoonClock-1.27.tar.gz) = adf74a0fff42a5e3d7823c7fabf71c95f47057e4
5Size (wmMoonClock-1.27.tar.gz) = 155197 bytes 5Size (wmMoonClock-1.27.tar.gz) = 155197 bytes
6SHA1 (patch-aa) = 6b9d2459c7b92bee200c06f543a85ce429b8cd7b 6SHA1 (patch-aa) = e6e38e186b6525c96e81c141d5ea75ce242b9e7a
cvs diff -r1.3 -r1.4 pkgsrc/time/wmmoonclock/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/time/wmmoonclock/patches/Attic/patch-aa 2002/10/27 13:40:30 1.3
+++ pkgsrc/time/wmmoonclock/patches/Attic/patch-aa 2010/02/12 00:28:36 1.4
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: patch-aa,v 1.3 2002/10/27 13:40:30 bouyer Exp $ 1$NetBSD: patch-aa,v 1.4 2010/02/12 00:28:36 joerg Exp $
2 2
3--- Makefile.orig Tue Mar 23 03:20:32 1999 3--- Makefile.orig Tue Mar 23 03:20:32 1999
4+++ Makefile Thu Oct 17 00:31:50 2002 4+++ Makefile Thu Oct 17 00:31:50 2002
5@@ -1,11 +1,11 @@ 5@@ -1,11 +1,11 @@
6 CC = gcc 6 CC = gcc
7 CFLAGS = -O2 7 CFLAGS = -O2
8-INCDIR = -I/usr/X11R6/include/X11 8-INCDIR = -I/usr/X11R6/include/X11
9-DESTDIR= /usr/X11R6 9-DESTDIR= /usr/X11R6
10-LIBDIR = -L/usr/X11R6/lib 10-LIBDIR = -L/usr/X11R6/lib
11+INCDIR = -I${PREFIX}/include -I${X11BASE}/include 11+INCDIR = -I${PREFIX}/include -I${X11BASE}/include
12+DESTDIR= ${PREFIX} 12+DESTDIR= ${PREFIX}
13+LIBDIR = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib 13+LIBDIR = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
14  14
15 # for Linux 15 # for Linux
16-LIBS = -lXpm -lX11 -lXext 16-LIBS = -lXpm -lX11 -lXext
17+LIBS = -lXpm -lX11 -lXext ${EXTRA_LOCAL_LIBS} 17+LIBS = -lXpm -lX11 -lXext ${EXTRA_LOCAL_LIBS}
18  18
19 # for Solaris 19 # for Solaris
20 # LIBS = -lXpm -lX11 -lXext -lsocket 20 # LIBS = -lXpm -lX11 -lXext -lsocket
21@@ -31,6 +31,5 @@ 21@@ -31,6 +31,5 @@
22 rm -f wmMoonClock 22 rm -f wmMoonClock
23  23
24 install:: wmMoonClock 24 install:: wmMoonClock
25- install -s -m 0755 wmMoonClock $(DESTDIR)/bin 25- install -s -m 0755 wmMoonClock $(DESTDIR)/bin
26- install -m 0644 wmMoonClock.1 $(DESTDIR)/man/man1  26- install -m 0644 wmMoonClock.1 $(DESTDIR)/man/man1
27- 27-
28+ $(BSD_INSTALL_PROGRAM) wmMoonClock $(DESTDIR)/bin 28+ $(BSD_INSTALL_PROGRAM) wmMoonClock $(DESTDIR)${PREFIX}/bin
29+ $(BSD_INSTALL_DATA) wmMoonClock.1 $(DESTDIR)/man/man1  29+ $(BSD_INSTALL_DATA) wmMoonClock.1 $(DESTDIR)${PREFIX}/${PKGMANDIR}/man1