diff options
author | wiz <wiz@pkgsrc.org> | 2002-01-25 19:20:28 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2002-01-25 19:20:28 +0000 |
commit | cfb94a4276b97d21dc5bd51c29ea2e5b3be33d4f (patch) | |
tree | 05832939e40df4dcd126c51e9fe5612645cf299d /graphics/giram | |
parent | a8f045be982c023698b4cd80e3fd19735b01383f (diff) | |
download | pkgsrc-cfb94a4276b97d21dc5bd51c29ea2e5b3be33d4f.tar.gz |
Fix pkg/15110; also pass PKGLOCALEDIR so that the locale file
is installed into the correct dir.
Diffstat (limited to 'graphics/giram')
-rw-r--r-- | graphics/giram/Makefile | 5 | ||||
-rw-r--r-- | graphics/giram/PLIST | 4 | ||||
-rw-r--r-- | graphics/giram/distinfo | 5 | ||||
-rw-r--r-- | graphics/giram/patches/patch-aa | 13 | ||||
-rw-r--r-- | graphics/giram/patches/patch-ak | 10 |
5 files changed, 26 insertions, 11 deletions
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index dad879a2633..bb5540ab109 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/09/27 23:18:11 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2002/01/25 19:20:28 wiz Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $ DISTNAME= Giram-0.1.2 @@ -21,10 +21,9 @@ GNU_CONFIGURE= yes EVAL_PREFIX+= GTKDIR=gtk+ CONFIGURE_ENV= GTK_CONFIG="${GTKDIR}/bin/gtk-config" \ + PKGLOCALEDIR="${PKGLOCALEDIR}" \ CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" -ALL_TARGET= install-strip - post-install: @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/Giram ${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/share/examples/Giram/ diff --git a/graphics/giram/PLIST b/graphics/giram/PLIST index 8367fac05a0..126a38fa076 100644 --- a/graphics/giram/PLIST +++ b/graphics/giram/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:07 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/01/25 19:20:28 wiz Exp $ bin/giram bin/povfront libexec/giram/plug-ins/Box @@ -27,7 +27,7 @@ share/examples/Giram/superel2.pov share/examples/Giram/superel3.pov share/examples/Giram/test.pov share/examples/Giram/torus.pov -share/locale/fr/LC_MESSAGES/Giram.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/Giram.mo @dirrm share/examples/Giram @dirrm share/doc/giram @dirrm libexec/giram/plug-ins diff --git a/graphics/giram/distinfo b/graphics/giram/distinfo index 3c6fe60dab7..4ec3fa8f6e0 100644 --- a/graphics/giram/distinfo +++ b/graphics/giram/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 09:54:14 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/01/25 19:20:28 wiz Exp $ SHA1 (Giram-0.1.2.tar.gz) = d0758b5bdc51d41c868ae68cf3ce1352b16b68ea Size (Giram-0.1.2.tar.gz) = 452540 bytes -SHA1 (patch-ak) = 5a85fadb7debb6b341b6647ca34da279500572ad +SHA1 (patch-aa) = 17354eedaedd64e8cdee895bc5c4c39d06391f4d +SHA1 (patch-ak) = 27587c5825d11ee9278edfb342fa1b6e6d20a428 diff --git a/graphics/giram/patches/patch-aa b/graphics/giram/patches/patch-aa new file mode 100644 index 00000000000..d32e208ba04 --- /dev/null +++ b/graphics/giram/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.3 2002/01/25 19:20:29 wiz Exp $ + +--- configure.orig Mon Aug 30 19:18:47 1999 ++++ configure +@@ -4497,7 +4497,7 @@ + s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g + s%@CATALOGS@%$CATALOGS%g + s%@CATOBJEXT@%$CATOBJEXT%g +-s%@DATADIRNAME@%$DATADIRNAME%g ++s%@DATADIRNAME@%$PKGLOCALEDIR%g + s%@GMOFILES@%$GMOFILES%g + s%@INSTOBJEXT@%$INSTOBJEXT%g + s%@INTLDEPS@%$INTLDEPS%g diff --git a/graphics/giram/patches/patch-ak b/graphics/giram/patches/patch-ak index 66d53476c25..9a3589f6081 100644 --- a/graphics/giram/patches/patch-ak +++ b/graphics/giram/patches/patch-ak @@ -1,8 +1,9 @@ -$NetBSD: patch-ak,v 1.2 1999/09/09 07:55:22 sakamoto Exp $ +$NetBSD: patch-ak,v 1.3 2002/01/25 19:20:29 wiz Exp $ ---- ./src/tools.c.orig Sat Aug 7 11:17:42 1999 -+++ ./src/tools.c Thu Sep 9 09:17:58 1999 -@@ -371,5 +371,6 @@ +--- src/tools.c.orig Sat Aug 7 04:17:42 1999 ++++ src/tools.c +@@ -370,7 +370,8 @@ + &MaskIcon, &transparent, Tools[i].Icon); - TD->PixmapInBox[0] = gtk_pixmap_new(PixmapIcon, MaskIcon); @@ -10,3 +11,4 @@ $NetBSD: patch-ak,v 1.2 1999/09/09 07:55:22 sakamoto Exp $ + TD->PixmapInBox[TD->pos] = gtk_pixmap_new(PixmapIcon, MaskIcon); /* Draw the little black triangle */ gc = gdk_gc_new((GTK_PIXMAP(TD->PixmapInBox[TD->pos]))->mask); + gdk_color_white(gdk_colormap_get_system(), &color); |