Thu Oct 20 11:32:11 2011 UTC ()
Fix more OWN_DIRS abuse.


(wiz)
diff -r1.1.1.1 -r1.2 pkgsrc/fonts/tamsyn-font/Makefile
diff -r1.6 -r1.7 pkgsrc/fonts/thaixfonts/Makefile
cvs diff -r1.1.1.1 -r1.2 pkgsrc/fonts/tamsyn-font/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/tamsyn-font/Makefile 2011/02/16 17:46:17 1.1.1.1
+++ pkgsrc/fonts/tamsyn-font/Makefile 2011/10/20 11:32:11 1.2
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1# $NetBSD: Makefile,v 1.1.1.1 2011/02/16 17:46:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.2 2011/10/20 11:32:11 wiz Exp $
2# 2#
3 3
4DISTNAME= tamsyn-font-1.6 4DISTNAME= tamsyn-font-1.6
5CATEGORIES= fonts x11 5CATEGORIES= fonts x11
6MASTER_SITES= http://www.fial.com/~scott/tamsyn-font/download/ 6MASTER_SITES= http://www.fial.com/~scott/tamsyn-font/download/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.fial.com/~scott/tamsyn-font/ 9HOMEPAGE= http://www.fial.com/~scott/tamsyn-font/
10COMMENT= Monospaced programming font 10COMMENT= Monospaced programming font
11# even less restrictions than that 11# even less restrictions than that
12LICENSE= isc 12LICENSE= isc
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16FONTDIR= ${PREFIX}/lib/X11/fonts/tamsyn-font 16FONTDIR= ${PREFIX}/lib/X11/fonts/tamsyn-font
17FONTS_DIRS.x11+= ${FONTDIR} 17FONTS_DIRS.x11+= ${FONTDIR}
18OWN_DIRS= ${FONTDIR} 
19 18
20INSTALLATION_DIRS= ${FONTDIR} share/doc/tamsyn-font 19INSTALLATION_DIRS= ${FONTDIR} share/doc/tamsyn-font
21 20
22do-build: 21do-build:
23 22
24do-install: 23do-install:
25 ${INSTALL_DATA} ${WRKSRC}/T* ${DESTDIR}${FONTDIR} 24 ${INSTALL_DATA} ${WRKSRC}/T* ${DESTDIR}${FONTDIR}
26 ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/tamsyn-font 25 ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/tamsyn-font
27 ${INSTALL_DATA} ${WRKSRC}/READ* ${DESTDIR}${PREFIX}/share/doc/tamsyn-font 26 ${INSTALL_DATA} ${WRKSRC}/READ* ${DESTDIR}${PREFIX}/share/doc/tamsyn-font
28 27
29.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/fonts/thaixfonts/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/thaixfonts/Makefile 2010/08/05 13:13:32 1.6
+++ pkgsrc/fonts/thaixfonts/Makefile 2011/10/20 11:32:11 1.7
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: Makefile,v 1.6 2010/08/05 13:13:32 obache Exp $ 1# $NetBSD: Makefile,v 1.7 2011/10/20 11:32:11 wiz Exp $
2# 2#
3 3
4DISTNAME= thaixfonts-1.2.5 4DISTNAME= thaixfonts-1.2.5
5CATEGORIES= fonts x11 5CATEGORIES= fonts x11
6MASTER_SITES= http://linux.thai.net/pub/thailinux/software/thaixfonts/ 6MASTER_SITES= http://linux.thai.net/pub/thailinux/software/thaixfonts/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://linux.thai.net/projects/thaixfonts 9HOMEPAGE= http://linux.thai.net/projects/thaixfonts
10COMMENT= The collection of Thai X fonts 10COMMENT= The collection of Thai X fonts
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_TOOLS+= gmake bdftopcf gzip 14USE_TOOLS+= gmake bdftopcf gzip
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16 16
17CONFIGURE_ARGS+= --with-fontdir=${FONTDIR} 17CONFIGURE_ARGS+= --with-fontdir=${FONTDIR}
18 18
19FONTDIR= ${PREFIX}/lib/X11/fonts/thaixfonts 19FONTDIR= ${PREFIX}/lib/X11/fonts/thaixfonts
20FONTS_DIRS.x11+= ${FONTDIR} 20FONTS_DIRS.x11+= ${FONTDIR}
21OWN_DIRS= ${FONTDIR} 21INSTALLATION_DIRS= ${FONTDIR}
22 22
23post-install: 23post-install:
24 cp -p ${DESTDIR}${FONTDIR}/thai.alias ${DESTDIR}${FONTDIR}/fonts.alias 24 cp -p ${DESTDIR}${FONTDIR}/thai.alias ${DESTDIR}${FONTDIR}/fonts.alias
25 25
26.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"