summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--misc/gwaei/Makefile30
-rw-r--r--misc/gwaei/PLIST31
-rw-r--r--misc/gwaei/PLIST.gnome30
-rw-r--r--misc/gwaei/distinfo9
-rw-r--r--misc/gwaei/options.mk28
-rw-r--r--misc/gwaei/patches/patch-aa17
6 files changed, 92 insertions, 53 deletions
diff --git a/misc/gwaei/Makefile b/misc/gwaei/Makefile
index 6afbec26141..75f4cfdf400 100644
--- a/misc/gwaei/Makefile
+++ b/misc/gwaei/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/08/26 19:58:01 sno Exp $
+# $NetBSD: Makefile,v 1.9 2009/10/22 22:27:23 wiz Exp $
#
-DISTNAME= gwaei-0.15.3
-PKGREVISION= 1
+DISTNAME= gwaei-1.0.1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gwaei/}
@@ -18,13 +17,11 @@ GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake perl pkg-config
-GCONF_SCHEMAS= gwaei.schemas
-
-SUBST_CLASSES+= perl
-SUBST_STAGE.perl= pre-configure
-SUBST_FILES.perl= src/kpengine/Makefile.in
-SUBST_SED.perl= -e "s,/usr/bin/perl,${PERL5},"
-SUBST_MESSAGE.perl= Fixing path to perl.
+#SUBST_CLASSES+= perl
+#SUBST_STAGE.perl= pre-configure
+#SUBST_FILES.perl= src/kpengine/Makefile.in
+#SUBST_SED.perl= -e "s,/usr/bin/perl,${PERL5},"
+#SUBST_MESSAGE.perl= Fixing path to perl.
SUBST_CLASSES+= rsync
SUBST_STAGE.rsync= pre-configure
@@ -32,22 +29,15 @@ SUBST_FILES.rsync= src/io.c
SUBST_SED.rsync= -e "s,@RSYNC@,${LOCALBASE}/bin/rsync,"
SUBST_MESSAGE.rsync= Fixing path to rsync.
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/src/schemas/gwaei.schemas \
- ${DESTDIR}${PREFIX}/share/gconf/schemas/
+PLIST_SRC= PLIST
+.include "options.mk"
-BUILDLINK_API_DEPENDS.GConf+= GConf>=2.22.0
-.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0
.include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.22.0
-.include "../../devel/libgnome/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libsexy+= libsexy>=0.1.11
-.include "../../devel/libsexy/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
BUILDLINK_API_DEPENDS.curl+= curl>=7.18.0
.include "../../www/curl/buildlink3.mk"
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.12.0
.include "../../x11/gtk2/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gwaei/PLIST b/misc/gwaei/PLIST
index 40384f81388..17660f90bd7 100644
--- a/misc/gwaei/PLIST
+++ b/misc/gwaei/PLIST
@@ -1,36 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:07:22 joerg Exp $
-bin/waei
+@comment $NetBSD: PLIST,v 1.7 2009/10/22 22:27:23 wiz Exp $
bin/gwaei
-share/applications/gwaei.desktop
+bin/waei
share/doc/${PKGNAME}/COPYING
share/doc/${PKGNAME}/ChangeLog
share/doc/${PKGNAME}/NEWS
-share/gconf/schemas/gwaei.schemas
-share/gnome/help/gwaei/C/glossary.xml
-share/gnome/help/gwaei/C/index.xml
-share/gwaei/character.png
-share/gwaei/character2.png
-share/gwaei/character3.png
-share/gwaei/jdata.dat
-share/gwaei/kanjipad.xml
-share/gwaei/kpengine
-share/gwaei/logo.png
-share/gwaei/main.xml
-share/gwaei/radicals.xml
-share/gwaei/settings.xml
-share/icons/hicolor/16x16/actions/non-word-boundary.png
-share/icons/hicolor/16x16/actions/unknown-character.png
-share/icons/hicolor/16x16/actions/word-boundary.png
-share/icons/hicolor/16x16/apps/gwaei.png
-share/icons/hicolor/22x22/actions/non-word-boundary.png
-share/icons/hicolor/22x22/actions/unknown-character.png
-share/icons/hicolor/22x22/actions/word-boundary.png
-share/icons/hicolor/24x24/actions/non-word-boundary.png
-share/icons/hicolor/24x24/actions/unknown-character.png
-share/icons/hicolor/24x24/actions/word-boundary.png
-share/icons/hicolor/24x24/apps/gwaei.png
-share/icons/hicolor/32x32/apps/gwaei.png
-share/icons/hicolor/48x48/apps/gwaei.png
share/locale/en@boldquot/LC_MESSAGES/gwaei.mo
share/locale/en@quot/LC_MESSAGES/gwaei.mo
share/locale/es/LC_MESSAGES/gwaei.mo
diff --git a/misc/gwaei/PLIST.gnome b/misc/gwaei/PLIST.gnome
new file mode 100644
index 00000000000..ebe122f34bf
--- /dev/null
+++ b/misc/gwaei/PLIST.gnome
@@ -0,0 +1,30 @@
+@comment $NetBSD: PLIST.gnome,v 1.1 2009/10/22 22:27:23 wiz Exp $
+bin/gwaei
+share/applications/gwaei.desktop
+share/gconf/schemas/gwaei.schemas
+share/gnome/help/gwaei/C/glossary.xml
+share/gnome/help/gwaei/C/gwaei.xml
+share/gwaei/character.png
+share/gwaei/character2.png
+share/gwaei/character3.png
+share/gwaei/jdata.dat
+share/gwaei/kanjipad.xml
+share/gwaei/kpengine
+share/gwaei/logo.png
+share/gwaei/main.xml
+share/gwaei/radicals.xml
+share/gwaei/settings.xml
+share/icons/hicolor/16x16/actions/non-word-boundary.png
+share/icons/hicolor/16x16/actions/unknown-character.png
+share/icons/hicolor/16x16/actions/word-boundary.png
+share/icons/hicolor/16x16/apps/gwaei.png
+share/icons/hicolor/22x22/actions/non-word-boundary.png
+share/icons/hicolor/22x22/actions/unknown-character.png
+share/icons/hicolor/22x22/actions/word-boundary.png
+share/icons/hicolor/24x24/actions/non-word-boundary.png
+share/icons/hicolor/24x24/actions/unknown-character.png
+share/icons/hicolor/24x24/actions/word-boundary.png
+share/icons/hicolor/24x24/apps/gwaei.png
+share/icons/hicolor/32x32/apps/gwaei.png
+share/icons/hicolor/48x48/apps/gwaei.png
+share/omf/gwaei/gwaei-C.omf
diff --git a/misc/gwaei/distinfo b/misc/gwaei/distinfo
index fc1ae92797c..26cdf83bf3f 100644
--- a/misc/gwaei/distinfo
+++ b/misc/gwaei/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2009/03/22 17:37:39 wiz Exp $
+$NetBSD: distinfo,v 1.7 2009/10/22 22:27:23 wiz Exp $
-SHA1 (gwaei-0.15.3.tar.gz) = d92c269c6b049774c6b6e51058d78c12ee6c2d6a
-RMD160 (gwaei-0.15.3.tar.gz) = 87df84e149c6a6a0dec62641937fe104648476aa
-Size (gwaei-0.15.3.tar.gz) = 536092 bytes
+SHA1 (gwaei-1.0.1.tar.gz) = 8638b7365e8a06c6bc0565fb5fac497081b81ee1
+RMD160 (gwaei-1.0.1.tar.gz) = 2456cfd89767d61e408d1c94019a479b90eda4ee
+Size (gwaei-1.0.1.tar.gz) = 551430 bytes
+SHA1 (patch-aa) = a9f5f6dda8efe6140bce1b9d9132ffd2f302e15a
diff --git a/misc/gwaei/options.mk b/misc/gwaei/options.mk
new file mode 100644
index 00000000000..bfbf7d5f874
--- /dev/null
+++ b/misc/gwaei/options.mk
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2009/10/22 22:27:23 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.gwaei
+PKG_SUPPORTED_OPTIONS= gnome
+PKG_SUGGESTED_OPTIONS= gnome
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnome)
+GCONF_SCHEMAS= gwaei.schemas
+PLIST_SRC+= PLIST.gnome
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/src/schemas/gwaei.schemas \
+ ${DESTDIR}${PREFIX}/share/gconf/schemas/
+
+BUILDLINK_API_DEPENDS.GConf+= GConf>=2.22.0
+.include "../../devel/GConf/schemas.mk"
+BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.22.0
+.include "../../devel/libgnome/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libsexy+= libsexy>=0.1.11
+.include "../../devel/libsexy/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/omf-scrollkeeper.mk"
+.else
+CONFIGURE_ARGS+= --without-gnome
+.endif
diff --git a/misc/gwaei/patches/patch-aa b/misc/gwaei/patches/patch-aa
new file mode 100644
index 00000000000..dc1f49d258c
--- /dev/null
+++ b/misc/gwaei/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2009/10/22 22:27:23 wiz Exp $
+
+From upstream, will be in next release.
+
+--- src/preferences-gconf.c.orig 2009-05-25 03:57:50.000000000 +0200
++++ src/preferences-gconf.c 2009-10-23 00:17:03.000000000 +0200
+@@ -170,6 +168,10 @@
+ return_value = NULL;
+ strncpy(output, backup, n);
+ }
++ else if (return_value == NULL || strlen(return_value) == 0)
++ {
++ strncpy(output, backup, n);
++ }
+ else
+ {
+ strncpy(output, return_value, n);
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-06 18:51:34 +0000