Tue Jul 7 20:46:04 2009 UTC ()
user-destdir support


(joerg)
diff -r1.17 -r1.18 pkgsrc/textproc/stardic/Makefile
diff -r1.4 -r1.5 pkgsrc/textproc/stardic/distinfo
diff -r1.2 -r1.3 pkgsrc/textproc/stardic/patches/patch-aa
cvs diff -r1.17 -r1.18 pkgsrc/textproc/stardic/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/stardic/Makefile 2008/08/12 17:20:19 1.17
+++ pkgsrc/textproc/stardic/Makefile 2009/07/07 20:46:04 1.18
@@ -1,23 +1,27 @@ @@ -1,23 +1,27 @@
1# $NetBSD: Makefile,v 1.17 2008/08/12 17:20:19 joerg Exp $ 1# $NetBSD: Makefile,v 1.18 2009/07/07 20:46:04 joerg Exp $
2 2
3DISTNAME= dic 3DISTNAME= dic
4PKGNAME= stardic-1.31 4PKGNAME= stardic-1.31
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= textproc 6CATEGORIES= textproc
7MASTER_SITES= http://download.linuxbyte.net/Chinese/dictionary/ 7MASTER_SITES= http://download.linuxbyte.net/Chinese/dictionary/
8DIST_SUBDIR= ${PKGNAME_NOREV} 8DIST_SUBDIR= ${PKGNAME_NOREV}
9 9
10MAINTAINER= rxg@NetBSD.org 10MAINTAINER= rxg@NetBSD.org
11COMMENT= English-Chinese dictionary 11COMMENT= English-Chinese dictionary
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
13MAKE_FILE= makefile 15MAKE_FILE= makefile
14USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
15 17
16FONTS_DIRS.x11+= ${PREFIX}/share/stardic/hzfont 18FONTS_DIRS.x11+= ${PREFIX}/share/stardic/hzfont
17REQD_DIRS+= ${PREFIX}/share/stardic ${PREFIX}/share/stardic/hzfont 19REQD_DIRS+= ${PREFIX}/share/stardic ${PREFIX}/share/stardic/hzfont
18 20
 21INSTALLATION_DIRS= bin
 22
19post-extract: 23post-extract:
20 chmod -R u+w,go-w ${WRKSRC} 24 chmod -R u+w,go-w ${WRKSRC}
21 25
22.include "../../mk/motif.buildlink3.mk" 26.include "../../mk/motif.buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/textproc/stardic/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/stardic/distinfo 2005/02/24 14:48:49 1.4
+++ pkgsrc/textproc/stardic/distinfo 2009/07/07 20:46:04 1.5
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.4 2005/02/24 14:48:49 agc Exp $ 1$NetBSD: distinfo,v 1.5 2009/07/07 20:46:04 joerg Exp $
2 2
3SHA1 (stardic-1.31/dic.tar.gz) = 89a4edcbac415232627c98680a9817f2a7676f48 3SHA1 (stardic-1.31/dic.tar.gz) = 89a4edcbac415232627c98680a9817f2a7676f48
4RMD160 (stardic-1.31/dic.tar.gz) = 1bd56627105e8035e14b3afbe2dd6f2af4239b48 4RMD160 (stardic-1.31/dic.tar.gz) = 1bd56627105e8035e14b3afbe2dd6f2af4239b48
5Size (stardic-1.31/dic.tar.gz) = 1800940 bytes 5Size (stardic-1.31/dic.tar.gz) = 1800940 bytes
6SHA1 (patch-aa) = af0aede61350b2e77d9df1deaa0d42a0a62cf043 6SHA1 (patch-aa) = 49e9a60550efa36d45a8dc907d87a9cf28dc1829
7SHA1 (patch-ab) = ccfe1401645b465785b087fc35eb8fa340bd74d2 7SHA1 (patch-ab) = ccfe1401645b465785b087fc35eb8fa340bd74d2
8SHA1 (patch-ac) = 91f647c7d3ddfe5bd8cf85533dd9902ec37f39a6 8SHA1 (patch-ac) = 91f647c7d3ddfe5bd8cf85533dd9902ec37f39a6
9SHA1 (patch-ad) = 1d3b772b9d1f722cf23311cb3f104e4b44fc375d 9SHA1 (patch-ad) = 1d3b772b9d1f722cf23311cb3f104e4b44fc375d
cvs diff -r1.2 -r1.3 pkgsrc/textproc/stardic/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/stardic/patches/patch-aa 2002/09/23 23:30:26 1.2
+++ pkgsrc/textproc/stardic/patches/patch-aa 2009/07/07 20:46:04 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.2 2002/09/23 23:30:26 jlam Exp $ 1$NetBSD: patch-aa,v 1.3 2009/07/07 20:46:04 joerg Exp $
2 2
3--- makefile.orig Sat Jan 29 12:07:34 2000 3--- makefile.orig Sat Jan 29 12:07:34 2000
4+++ makefile 4+++ makefile
5@@ -1,15 +1,16 @@ 5@@ -1,15 +1,16 @@
6 TRANSOBJ= trans.o image.o regdef.o 6 TRANSOBJ= trans.o image.o regdef.o
7+TRANSDIR= $(PREFIX)/share/stardic 7+TRANSDIR= $(PREFIX)/share/stardic
8  8
9 # modify those variables for yourself 9 # modify those variables for yourself
10  10
11 # for linux 11 # for linux
12-LDFLAGS= -L/usr/X11/lib -lXm -lXt -lXext -lX11 12-LDFLAGS= -L/usr/X11/lib -lXm -lXt -lXext -lX11
13+LDFLAGS+= -L${X11BASE}/lib -lXm -lXt -lXext -lX11 13+LDFLAGS+= -L${X11BASE}/lib -lXm -lXt -lXext -lX11
14  14
@@ -32,18 +32,18 @@ $NetBSD: patch-aa,v 1.2 2002/09/23 23:30 @@ -32,18 +32,18 @@ $NetBSD: patch-aa,v 1.2 2002/09/23 23:30
32+CC= $(CXX) 32+CC= $(CXX)
33 #CC= CC 33 #CC= CC
34  34
35 .KEEP_STATE: 35 .KEEP_STATE:
36-stardic:$(TRANSOBJ) 36-stardic:$(TRANSOBJ)
37+all: $(TRANSOBJ) 37+all: $(TRANSOBJ)
38 $(LINK.c) -o stardic $(TRANSOBJ) 38 $(LINK.c) -o stardic $(TRANSOBJ)
39+ gzip hzfont/*.pcf 39+ gzip hzfont/*.pcf
40  40
41 .cc.o: 41 .cc.o:
42 $(COMPILE.c) $< 42 $(COMPILE.c) $<
43+ 43+
44+install: 44+install:
45+ $(BSD_INSTALL_PROGRAM) stardic $(PREFIX)/bin 45+ $(BSD_INSTALL_PROGRAM) stardic ${DESTDIR}$(PREFIX)/bin
46+ $(BSD_INSTALL_DATA_DIR) $(TRANSDIR) 46+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(TRANSDIR)
47+ $(BSD_INSTALL_DATA) transdic yblib *.gif *.xbm $(TRANSDIR) 47+ $(BSD_INSTALL_DATA) transdic yblib *.gif *.xbm ${DESTDIR}$(TRANSDIR)
48+ $(BSD_INSTALL_DATA_DIR) $(TRANSDIR)/hzfont 48+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(TRANSDIR)/hzfont
49+ $(BSD_INSTALL_DATA) hzfont/fonts.dir hzfont/*.pcf.gz $(TRANSDIR)/hzfont 49+ $(BSD_INSTALL_DATA) hzfont/fonts.dir hzfont/*.pcf.gz ${DESTDIR}$(TRANSDIR)/hzfont