Fix GConf schema file directory PKGREVISION++diff -r1.5 -r1.6 pkgsrc/net/dcsharp/Makefile
(kefren)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.5 2008/10/31 12:00:04 obache Exp $ | 1 | # $NetBSD: Makefile,v 1.6 2009/01/06 18:54:51 kefren Exp $ | |
2 | 2 | |||
3 | DISTNAME= dcsharp-0.11.1 | 3 | DISTNAME= dcsharp-0.11.1 | |
4 | PKGREVISION= 3 | 4 | PKGREVISION= 4 | |
5 | CATEGORIES= net | 5 | CATEGORIES= net | |
6 | MASTER_SITES= http://dcsharp.googlecode.com/files/ | 6 | MASTER_SITES= http://dcsharp.googlecode.com/files/ | |
7 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://code.google.com/p/dcsharp/ | 10 | HOMEPAGE= http://code.google.com/p/dcsharp/ | |
11 | COMMENT= File sharing client for the Direct Connect protocol | 11 | COMMENT= File sharing client for the Direct Connect protocol | |
12 | 12 | |||
13 | USE_TOOLS+= pkg-config msgfmt | 13 | USE_TOOLS+= pkg-config msgfmt | |
14 | USE_LANGUAGES= c++ | 14 | USE_LANGUAGES= c++ | |
15 | NO_CONFIGURE= yes | 15 | NO_CONFIGURE= yes | |
16 | 16 | |||
17 | BUILD_DEPENDS+= scons>=0.96.1:../../devel/scons | 17 | BUILD_DEPENDS+= scons>=0.96.1:../../devel/scons |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $ | 1 | @comment $NetBSD: PLIST,v 1.2 2009/01/06 18:54:51 kefren Exp $ | |
2 | bin/dcsharp | 2 | bin/dcsharp | |
3 | share/applications/dcsharp.desktop | 3 | share/applications/dcsharp.desktop | |
4 | lib/dcsharp/DCSharp.Base.dll | 4 | lib/dcsharp/DCSharp.Base.dll | |
5 | lib/dcsharp/DCSharp.Base.dll.config | 5 | lib/dcsharp/DCSharp.Base.dll.config | |
6 | lib/dcsharp/DCSharp.exe | 6 | lib/dcsharp/DCSharp.exe | |
7 | lib/dcsharp/DCSharp.exe.config | 7 | lib/dcsharp/DCSharp.exe.config | |
8 | lib/dcsharp/notify-sharp.dll | 8 | lib/dcsharp/notify-sharp.dll | |
9 | lib/dcsharp/notify-sharp.dll.config | 9 | lib/dcsharp/notify-sharp.dll.config | |
10 | etc/gconf/schemas/dcsharp-handlers.schema | 10 | share/gconf/schemas/dcsharp-handlers.schema | |
11 | share/locale/sv/LC_MESSAGES/dcsharp.mo | 11 | share/locale/sv/LC_MESSAGES/dcsharp.mo | |
12 | share/locale/pl/LC_MESSAGES/dcsharp.mo | 12 | share/locale/pl/LC_MESSAGES/dcsharp.mo | |
13 | share/locale/de/LC_MESSAGES/dcsharp.mo | 13 | share/locale/de/LC_MESSAGES/dcsharp.mo | |
14 | @dirrm etc/gconf/schemas | 14 | @dirrm etc/gconf/schemas |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | $NetBSD: distinfo,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $ | 1 | $NetBSD: distinfo,v 1.2 2009/01/06 18:54:51 kefren Exp $ | |
2 | 2 | |||
3 | SHA1 (dcsharp-0.11.1.tar.bz2) = 7589a5620619a85ebb9c5f531a558e72c81e2c79 | 3 | SHA1 (dcsharp-0.11.1.tar.bz2) = 7589a5620619a85ebb9c5f531a558e72c81e2c79 | |
4 | RMD160 (dcsharp-0.11.1.tar.bz2) = 524630248f0c353abf81f2854d6e0a67b764f318 | 4 | RMD160 (dcsharp-0.11.1.tar.bz2) = 524630248f0c353abf81f2854d6e0a67b764f318 | |
5 | Size (dcsharp-0.11.1.tar.bz2) = 207178 bytes | 5 | Size (dcsharp-0.11.1.tar.bz2) = 207178 bytes | |
6 | SHA1 (patch-aa) = ca2b8120e2114ce901b2578d7a266d6277f3aa21 | 6 | SHA1 (patch-aa) = 81c4152a1dc33bdc373fa85626407383987b2ae3 | |
7 | SHA1 (patch-ab) = a410159c9c4d6c379024560b6f34229a38d4995e | 7 | SHA1 (patch-ab) = a410159c9c4d6c379024560b6f34229a38d4995e | |
8 | SHA1 (patch-ac) = 8ea771838c3497a9121473454dff55e87577c03c | 8 | SHA1 (patch-ac) = 8ea771838c3497a9121473454dff55e87577c03c | |
9 | SHA1 (patch-ad) = 779fded1a2068e10e7bc81722e519ab2283d16db | 9 | SHA1 (patch-ad) = 779fded1a2068e10e7bc81722e519ab2283d16db | |
10 | SHA1 (patch-ae) = dd544e02773d645a326bc9a3e6b1bb89b797ff89 | 10 | SHA1 (patch-ae) = dd544e02773d645a326bc9a3e6b1bb89b797ff89 | |
11 | SHA1 (patch-af) = 25a2b2f47a5307dde058005677f2212c95589ab1 | 11 | SHA1 (patch-af) = 25a2b2f47a5307dde058005677f2212c95589ab1 | |
12 | SHA1 (patch-ag) = bc3a593351cde3968cedab70ec5bc01896548e34 | 12 | SHA1 (patch-ag) = bc3a593351cde3968cedab70ec5bc01896548e34 | |
13 | SHA1 (patch-ah) = b996e20c6cd6201bd54c6b7b7c22d627fa0a0ec7 | 13 | SHA1 (patch-ah) = b996e20c6cd6201bd54c6b7b7c22d627fa0a0ec7 | |
14 | SHA1 (patch-ai) = ce6ed38c77bfcf17d367cc5152a78b7ebc8ab1e3 | 14 | SHA1 (patch-ai) = ce6ed38c77bfcf17d367cc5152a78b7ebc8ab1e3 | |
15 | SHA1 (patch-aj) = 10f3076e1d2205b510aa76bc46f9a8933bd8fbfa | 15 | SHA1 (patch-aj) = 10f3076e1d2205b510aa76bc46f9a8933bd8fbfa | |
16 | SHA1 (patch-ak) = 283168eb4dc137e2050bd0dc6fd17155ec5aba40 | 16 | SHA1 (patch-ak) = 283168eb4dc137e2050bd0dc6fd17155ec5aba40 | |
17 | SHA1 (patch-al) = dfac5219c6dd24c197cbffcdca88295b1238192a | 17 | SHA1 (patch-al) = dfac5219c6dd24c197cbffcdca88295b1238192a | |
18 | SHA1 (patch-am) = 793da3431a6f2b5c57c0a6eb674e8374b7dd8391 | 18 | SHA1 (patch-am) = 793da3431a6f2b5c57c0a6eb674e8374b7dd8391 | |
19 | SHA1 (patch-an) = 1d7bb63a6e7d75fbb76e853d8d1b9bb27f1c6ca4 | 19 | SHA1 (patch-an) = 1d7bb63a6e7d75fbb76e853d8d1b9bb27f1c6ca4 |
@@ -1,21 +1,21 @@ | @@ -1,21 +1,21 @@ | |||
1 | $NetBSD: patch-aa,v 1.1.1.1 2008/04/25 16:10:27 kefren Exp $ | 1 | $NetBSD: patch-aa,v 1.2 2009/01/06 18:54:51 kefren Exp $ | |
2 | --- SConstruct.orig 2007-10-26 12:11:04.000000000 +0300 | 2 | --- SConstruct.orig 2007-10-26 12:11:04.000000000 +0300 | |
3 | +++ SConstruct 2008-04-24 21:34:37.000000000 +0300 | 3 | +++ SConstruct 2008-04-24 21:34:37.000000000 +0300 | |
4 | @@ -12,7 +12,7 @@ | 4 | @@ -12,7 +12,7 @@ | |
5 | opts.Add(PathOption('LIBDIR', 'System library path', '$PREFIX/lib')); | 5 | opts.Add(PathOption('LIBDIR', 'System library path', '$PREFIX/lib')); | |
6 | opts.Add(PathOption('BINDIR', 'System executable path', '$PREFIX/bin')); | 6 | opts.Add(PathOption('BINDIR', 'System executable path', '$PREFIX/bin')); | |
7 | opts.Add(PathOption('SHAREDIR', 'System shared data path', '$PREFIX/share')); | 7 | opts.Add(PathOption('SHAREDIR', 'System shared data path', '$PREFIX/share')); | |
8 | -opts.Add(PathOption('SYSCONFDIR', 'System configuration path', '/etc')); | 8 | -opts.Add(PathOption('SYSCONFDIR', 'System configuration path', '/etc')); | |
9 | +opts.Add(PathOption('SYSCONFDIR', 'System configuration path', '$PREFIX/etc')); | 9 | +opts.Add(PathOption('SYSCONFDIR', 'System configuration path', '$PREFIX/share')); | |
10 | opts.Add(PathOption('DESTDIR', 'System base installation path', '/')); | 10 | opts.Add(PathOption('DESTDIR', 'System base installation path', '/')); | |
11 | 11 | |||
12 | opts.Add(BoolOption('DEBUG', 'Compile with debug information', 0)); | 12 | opts.Add(BoolOption('DEBUG', 'Compile with debug information', 0)); | |
13 | @@ -179,7 +179,7 @@ | 13 | @@ -179,7 +179,7 @@ | |
14 | env['RESOURCE'] = Split('') | 14 | env['RESOURCE'] = Split('') | |
15 | env['CSCFLAGS'] = Split('') | 15 | env['CSCFLAGS'] = Split('') | |
16 | 16 | |||
17 | -env = Environment(options = opts) | 17 | -env = Environment(options = opts) | |
18 | +env = Environment(ENV = os.environ, options = opts) | 18 | +env = Environment(ENV = os.environ, options = opts) | |
19 | conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig, | 19 | conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig, | |
20 | 'CheckPKG' : CheckPKG }) | 20 | 'CheckPKG' : CheckPKG }) | |
21 | Help(opts.GenerateHelpText(env)) | 21 | Help(opts.GenerateHelpText(env)) |