diff options
| -rw-r--r-- | comms/efax-gtk/Makefile | 15 | ||||
| -rw-r--r-- | comms/efax-gtk/PLIST | 5 | ||||
| -rw-r--r-- | comms/efax-gtk/distinfo | 12 | ||||
| -rw-r--r-- | comms/efax-gtk/patches/patch-aa | 21 | ||||
| -rw-r--r-- | comms/efax-gtk/patches/patch-ad | 31 | ||||
| -rw-r--r-- | comms/efax-gtk/patches/patch-efax-gtk-faxfilter_Makefile.in | 15 |
6 files changed, 42 insertions, 57 deletions
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile index c35543306e5..4e2ac531fe0 100644 --- a/comms/efax-gtk/Makefile +++ b/comms/efax-gtk/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.69 2014/05/05 00:47:41 ryoon Exp $ +# $NetBSD: Makefile,v 1.70 2014/07/19 06:44:05 ryoon Exp $ -DISTNAME= efax-gtk-3.2.3.src -PKGNAME= efax-gtk-3.2.3 -PKGREVISION= 20 +DISTNAME= efax-gtk-3.2.13.src +PKGNAME= ${DISTNAME:S/.src//} CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=efax-gtk/} EXTRACT_SUFX= .tgz @@ -21,19 +20,19 @@ CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/spool/efax LDFLAGS.DragonFly= -lX11 LDFLAGS.SunOS+= -lX11 -lsocket -lnsl +OWN_DIRS_PERMS+= ${VARBASE}/spool/efax lp lp 755 + EGDIR= ${PREFIX}/share/examples CONF_FILES= ${EGDIR}/efax-gtkrc ${PKG_SYSCONFDIR}/efax-gtkrc SUBST_CLASSES+= xopen SUBST_MESSAGE.xopen= Removing _XOPEN_SOURCE=600 definition -SUBST_STAGE.xopen= post-patch +SUBST_STAGE.xopen= pre-configure SUBST_FILES.xopen= src/Makefile.in src/utils/Makefile.in -SUBST_FILES.xopen+= src/internal/c++-gtk-utils/Makefile.in SUBST_SED.xopen= -e 's,-D_XOPEN_SOURCE=600,,' .include "../../converters/libiconv/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../x11/gtkmm/buildlink3.mk" +.include "../../x11/c++-gtk-utils/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/efax-gtk/PLIST b/comms/efax-gtk/PLIST index c5a95597b00..079f1284b16 100644 --- a/comms/efax-gtk/PLIST +++ b/comms/efax-gtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2007/01/07 13:46:18 adam Exp $ +@comment $NetBSD: PLIST,v 1.11 2014/07/19 06:44:05 ryoon Exp $ bin/efax-0.9a bin/efax-gtk bin/efix-0.9a @@ -12,6 +12,8 @@ share/locale/ca/LC_MESSAGES/efax-gtk.mo share/locale/de/LC_MESSAGES/efax-gtk.mo share/locale/el/LC_MESSAGES/efax-gtk.mo share/locale/en_GB/LC_MESSAGES/efax-gtk.mo +share/locale/es/LC_MESSAGES/efax-gtk.mo +share/locale/fr/LC_MESSAGES/efax-gtk.mo share/locale/he/LC_MESSAGES/efax-gtk.mo share/locale/hu/LC_MESSAGES/efax-gtk.mo share/locale/it/LC_MESSAGES/efax-gtk.mo @@ -21,3 +23,4 @@ share/locale/sq/LC_MESSAGES/efax-gtk.mo share/locale/sv/LC_MESSAGES/efax-gtk.mo share/locale/zh_CN/LC_MESSAGES/efax-gtk.mo share/locale/zh_TW/LC_MESSAGES/efax-gtk.mo +share/pixmaps/efax-gtk.png diff --git a/comms/efax-gtk/distinfo b/comms/efax-gtk/distinfo index f6c8819086c..e578aab8407 100644 --- a/comms/efax-gtk/distinfo +++ b/comms/efax-gtk/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.23 2010/06/12 00:08:54 wiz Exp $ +$NetBSD: distinfo,v 1.24 2014/07/19 06:44:05 ryoon Exp $ -SHA1 (efax-gtk-3.2.3.src.tgz) = 4c46b1cdbf2c7ab7fb82bccb48a2e655a76c302d -RMD160 (efax-gtk-3.2.3.src.tgz) = 642b8a742515a8f8ed1c0ed78d59911401a1bf9d -Size (efax-gtk-3.2.3.src.tgz) = 1280080 bytes -SHA1 (patch-aa) = 6e45e4779af6c8fd2f729daf988049ec1c31b5ed +SHA1 (efax-gtk-3.2.13.src.tgz) = 78ff25f2cdf4b4602fa0a7c92b26e3e8aeb14c7e +RMD160 (efax-gtk-3.2.13.src.tgz) = 74054326b2de7f3ad54b9ec792f6e91e01c15281 +Size (efax-gtk-3.2.13.src.tgz) = 1245015 bytes +SHA1 (patch-aa) = 6e8e744170010b07c893222fefb9c387a9400c0f SHA1 (patch-ab) = bb6ce03029f07ffd041fc04fb2c5196f1522b11c SHA1 (patch-ac) = 37437cfc0ca259cecfd25aa4652c8009cfdb8066 -SHA1 (patch-ad) = a80a536aed81ac60a5f3e9a414c944bd33281707 +SHA1 (patch-efax-gtk-faxfilter_Makefile.in) = 9b57a2afbabe172c894ea914b2fdf7542c172276 diff --git a/comms/efax-gtk/patches/patch-aa b/comms/efax-gtk/patches/patch-aa index 570cdd115cf..5c5d456b708 100644 --- a/comms/efax-gtk/patches/patch-aa +++ b/comms/efax-gtk/patches/patch-aa @@ -1,22 +1,21 @@ -$NetBSD: patch-aa,v 1.11 2010/06/10 06:44:00 adam Exp $ +$NetBSD: patch-aa,v 1.12 2014/07/19 06:44:05 ryoon Exp $ ---- Makefile.in.orig 2010-06-04 08:50:10.000000000 +0000 +--- Makefile.in.orig 2014-04-11 10:10:35.000000000 +0000 +++ Makefile.in -@@ -392,15 +392,15 @@ uninstall-desktopDATA: - cd "$(DESTDIR)$(desktopdir)" && rm -f $$files - install-sysconfDATA: $(sysconf_DATA) - @$(NORMAL_INSTALL) -- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" -+ test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)/examples" +@@ -518,7 +518,7 @@ install-sysconfDATA: $(sysconf_DATA) @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ ++ $(MKDIR_P) "$(DESTDIR)$(datadir)/examples" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ +@@ -526,7 +526,7 @@ install-sysconfDATA: $(sysconf_DATA) done | $(am__base_list) | \ while read files; do \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datadir)/examples'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)/examples" || exit $$?; \ done diff --git a/comms/efax-gtk/patches/patch-ad b/comms/efax-gtk/patches/patch-ad deleted file mode 100644 index c4e2b6a2566..00000000000 --- a/comms/efax-gtk/patches/patch-ad +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ad,v 1.9 2010/06/10 06:44:00 adam Exp $ - ---- configure.orig 2010-06-03 20:27:33.000000000 +0000 -+++ configure -@@ -4999,7 +4999,7 @@ $as_echo_n "checking which version of gt - # Check whether --with-gtk-version was given. - if test "${with_gtk_version+set}" = set; then : - withval=$with_gtk_version; -- if test "x$withval" == "xgtk+2"; then -+ if test "x$withval" = "xgtk+2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk+2" >&5 - $as_echo "gtk+2" >&6; } - CGU_GTK_VERSION=2 -@@ -5098,7 +5098,7 @@ $as_echo "no" >&6; } - as_fn_error "Library requirements (gtk+-2.0 >= 2.12.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 - fi - -- elif test "x$withval" == "xgtk+3"; then -+ elif test "x$withval" = "xgtk+3"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk+3" >&5 - $as_echo "gtk+3" >&6; } - CGU_GTK_VERSION=3 -@@ -5197,7 +5197,7 @@ $as_echo "no" >&6; } - as_fn_error "Library requirements (gtk+-3.0 >= 2.90.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 - fi - -- elif test "x$withval" == "xauto"; then -+ elif test "x$withval" = "xauto"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto" >&5 - $as_echo "auto" >&6; } - diff --git a/comms/efax-gtk/patches/patch-efax-gtk-faxfilter_Makefile.in b/comms/efax-gtk/patches/patch-efax-gtk-faxfilter_Makefile.in new file mode 100644 index 00000000000..6f7541bd1ca --- /dev/null +++ b/comms/efax-gtk/patches/patch-efax-gtk-faxfilter_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-efax-gtk-faxfilter_Makefile.in,v 1.1 2014/07/19 06:44:05 ryoon Exp $ + +--- efax-gtk-faxfilter/Makefile.in.orig 2014-04-11 10:10:35.000000000 +0000 ++++ efax-gtk-faxfilter/Makefile.in +@@ -664,8 +664,8 @@ uninstall-am: uninstall-spoolPROGRAMS un + + + install-data-hook: +- -chown lp $(spooldir) 2> /dev/null +- -chgrp lp $(spooldir) 2> /dev/null ++ #-chown lp $(spooldir) 2> /dev/null ++ #-chgrp lp $(spooldir) 2> /dev/null + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. |