Re: UPDATE x11/tilda-1.5.0

2020-03-04 Thread Bjorn Ketelaars 
On Thu 27/02/2020 06:34, Bjorn Ketelaars wrote:
> On Thu 20/02/2020 06:33, Björn Ketelaars wrote:
> > Diff below updates x11/tilda to 1.5.0. Changelog:
> > https://github.com/lanoxx/tilda/blob/tilda-1.5.0/ChangeLog.
> > 
> > Run tested on amd64.
> > 
> > OK?
> 
> Ping

Ping

Diff enclosed for your convenience.


diff --git Makefile Makefile
index 37205ca00a4..dd98eed2fce 100644
--- Makefile
+++ Makefile
@@ -4,10 +4,8 @@ COMMENT=   drop-down terminal emulator
 
 GH_ACCOUNT=lanoxx
 GH_PROJECT=tilda
-GH_TAGNAME=tilda-1.3.3
-DISTNAME=  tilda-1.3.3
-
-REVISION=  2
+GH_TAGNAME=tilda-1.5.0
+DISTNAME=  tilda-1.5.0
 
 CATEGORIES=x11
 
diff --git distinfo distinfo
index 889a65edb16..56f62bf3fcf 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (tilda-1.3.3.tar.gz) = cbqlVyxJjls+lPW1foEYwe8P2uommlskJSCOGt7ChLE=
-SIZE (tilda-1.3.3.tar.gz) = 671222
+SHA256 (tilda-1.5.0.tar.gz) = 9mTBfayiopAPSd6etldGztA8hnsCFEFJ7yEmDLzWEDk=
+SIZE (tilda-1.5.0.tar.gz) = 484754
diff --git patches/patch-src-tilda_c patches/patch-src-tilda_c
index f386301cad3..482fb772401 100644
--- patches/patch-src-tilda_c
+++ patches/patch-src-tilda_c
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src-tilda_c,v 1.3 2016/11/06 06:54:54 jca Exp $
 src/tilda.c.orig   Mon Apr 18 14:09:55 2016
-+++ src/tilda.cSun Nov  6 07:43:00 2016
-@@ -12,8 +12,6 @@
+Index: src/tilda.c
+--- src/tilda.c.orig
 src/tilda.c
+@@ -13,8 +13,6 @@
   * You should have received a copy of the GNU Library General Public
   * License along with this library. If not, see 
.
   */
@@ -10,7 +11,7 @@ $OpenBSD: patch-src-tilda_c,v 1.3 2016/11/06 06:54:54 jca Exp 
$
  
  /*
   * This message is shown in a modal dialog when tilda starts and there is a 
problem parsing the configuration file.
-@@ -230,7 +228,7 @@ nomatch:
+@@ -232,7 +230,7 @@ nomatch:
  static GSList *getPids() {
  GSList *pids = NULL;
  FILE *ps_output;
diff --git pkg/PLIST pkg/PLIST
index 6634a4414b8..def38674c15 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,7 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.7 2018/06/27 21:04:23 espie Exp $
 @bin bin/tilda
-share/appdata/
-share/appdata/tilda.appdata.xml
 share/applications/tilda.desktop
 share/doc/tilda/
 share/doc/tilda/README.md
@@ -16,6 +14,7 @@ share/locale/fr/LC_MESSAGES/tilda.mo
 share/locale/hu/LC_MESSAGES/tilda.mo
 share/locale/it/LC_MESSAGES/tilda.mo
 share/locale/lt/LC_MESSAGES/tilda.mo
+share/locale/nb/LC_MESSAGES/tilda.mo
 share/locale/pl/LC_MESSAGES/tilda.mo
 share/locale/pt/LC_MESSAGES/tilda.mo
 share/locale/pt_BR/LC_MESSAGES/tilda.mo
@@ -25,6 +24,9 @@ share/locale/sl/LC_MESSAGES/tilda.mo
 share/locale/sv/LC_MESSAGES/tilda.mo
 share/locale/tr/LC_MESSAGES/tilda.mo
 share/locale/zh_CN/LC_MESSAGES/tilda.mo
+share/locale/zh_TW/LC_MESSAGES/tilda.mo
+share/metainfo/
+share/metainfo/tilda.appdata.xml
 share/pixmaps/
 share/pixmaps/tilda.png
 @tag update-desktop-database

Re: UPDATE x11/tilda-1.5.0

2020-02-26 Thread Bjorn Ketelaars 
On Thu 20/02/2020 06:33, Björn Ketelaars wrote:
> Diff below updates x11/tilda to 1.5.0. Changelog:
> https://github.com/lanoxx/tilda/blob/tilda-1.5.0/ChangeLog.
> 
> Run tested on amd64.
> 
> OK?

Ping

Diff enclosed for your convenience.


diff --git Makefile Makefile
index 37205ca00a4..dd98eed2fce 100644
--- Makefile
+++ Makefile
@@ -4,10 +4,8 @@ COMMENT=   drop-down terminal emulator
 
 GH_ACCOUNT=lanoxx
 GH_PROJECT=tilda
-GH_TAGNAME=tilda-1.3.3
-DISTNAME=  tilda-1.3.3
-
-REVISION=  2
+GH_TAGNAME=tilda-1.5.0
+DISTNAME=  tilda-1.5.0
 
 CATEGORIES=x11
 
diff --git distinfo distinfo
index 889a65edb16..56f62bf3fcf 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (tilda-1.3.3.tar.gz) = cbqlVyxJjls+lPW1foEYwe8P2uommlskJSCOGt7ChLE=
-SIZE (tilda-1.3.3.tar.gz) = 671222
+SHA256 (tilda-1.5.0.tar.gz) = 9mTBfayiopAPSd6etldGztA8hnsCFEFJ7yEmDLzWEDk=
+SIZE (tilda-1.5.0.tar.gz) = 484754
diff --git patches/patch-src-tilda_c patches/patch-src-tilda_c
index f386301cad3..482fb772401 100644
--- patches/patch-src-tilda_c
+++ patches/patch-src-tilda_c
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src-tilda_c,v 1.3 2016/11/06 06:54:54 jca Exp $
 src/tilda.c.orig   Mon Apr 18 14:09:55 2016
-+++ src/tilda.cSun Nov  6 07:43:00 2016
-@@ -12,8 +12,6 @@
+Index: src/tilda.c
+--- src/tilda.c.orig
 src/tilda.c
+@@ -13,8 +13,6 @@
   * You should have received a copy of the GNU Library General Public
   * License along with this library. If not, see 
.
   */
@@ -10,7 +11,7 @@ $OpenBSD: patch-src-tilda_c,v 1.3 2016/11/06 06:54:54 jca Exp 
$
  
  /*
   * This message is shown in a modal dialog when tilda starts and there is a 
problem parsing the configuration file.
-@@ -230,7 +228,7 @@ nomatch:
+@@ -232,7 +230,7 @@ nomatch:
  static GSList *getPids() {
  GSList *pids = NULL;
  FILE *ps_output;
diff --git pkg/PLIST pkg/PLIST
index 6634a4414b8..def38674c15 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,7 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.7 2018/06/27 21:04:23 espie Exp $
 @bin bin/tilda
-share/appdata/
-share/appdata/tilda.appdata.xml
 share/applications/tilda.desktop
 share/doc/tilda/
 share/doc/tilda/README.md
@@ -16,6 +14,7 @@ share/locale/fr/LC_MESSAGES/tilda.mo
 share/locale/hu/LC_MESSAGES/tilda.mo
 share/locale/it/LC_MESSAGES/tilda.mo
 share/locale/lt/LC_MESSAGES/tilda.mo
+share/locale/nb/LC_MESSAGES/tilda.mo
 share/locale/pl/LC_MESSAGES/tilda.mo
 share/locale/pt/LC_MESSAGES/tilda.mo
 share/locale/pt_BR/LC_MESSAGES/tilda.mo
@@ -25,6 +24,9 @@ share/locale/sl/LC_MESSAGES/tilda.mo
 share/locale/sv/LC_MESSAGES/tilda.mo
 share/locale/tr/LC_MESSAGES/tilda.mo
 share/locale/zh_CN/LC_MESSAGES/tilda.mo
+share/locale/zh_TW/LC_MESSAGES/tilda.mo
+share/metainfo/
+share/metainfo/tilda.appdata.xml
 share/pixmaps/
 share/pixmaps/tilda.png
 @tag update-desktop-database

UPDATE x11/tilda-1.5.0

2020-02-19 Thread Björn Ketelaars 
Diff below updates x11/tilda to 1.5.0. Changelog:
https://github.com/lanoxx/tilda/blob/tilda-1.5.0/ChangeLog.

Run tested on amd64.

OK?


diff --git Makefile Makefile
index 37205ca00a4..dd98eed2fce 100644
--- Makefile
+++ Makefile
@@ -4,10 +4,8 @@ COMMENT=   drop-down terminal emulator
 
 GH_ACCOUNT=lanoxx
 GH_PROJECT=tilda
-GH_TAGNAME=tilda-1.3.3
-DISTNAME=  tilda-1.3.3
-
-REVISION=  2
+GH_TAGNAME=tilda-1.5.0
+DISTNAME=  tilda-1.5.0
 
 CATEGORIES=x11
 
diff --git distinfo distinfo
index 889a65edb16..56f62bf3fcf 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (tilda-1.3.3.tar.gz) = cbqlVyxJjls+lPW1foEYwe8P2uommlskJSCOGt7ChLE=
-SIZE (tilda-1.3.3.tar.gz) = 671222
+SHA256 (tilda-1.5.0.tar.gz) = 9mTBfayiopAPSd6etldGztA8hnsCFEFJ7yEmDLzWEDk=
+SIZE (tilda-1.5.0.tar.gz) = 484754
diff --git patches/patch-src-tilda_c patches/patch-src-tilda_c
index f386301cad3..482fb772401 100644
--- patches/patch-src-tilda_c
+++ patches/patch-src-tilda_c
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src-tilda_c,v 1.3 2016/11/06 06:54:54 jca Exp $
 src/tilda.c.orig   Mon Apr 18 14:09:55 2016
-+++ src/tilda.cSun Nov  6 07:43:00 2016
-@@ -12,8 +12,6 @@
+Index: src/tilda.c
+--- src/tilda.c.orig
 src/tilda.c
+@@ -13,8 +13,6 @@
   * You should have received a copy of the GNU Library General Public
   * License along with this library. If not, see 
.
   */
@@ -10,7 +11,7 @@ $OpenBSD: patch-src-tilda_c,v 1.3 2016/11/06 06:54:54 jca Exp 
$
  
  /*
   * This message is shown in a modal dialog when tilda starts and there is a 
problem parsing the configuration file.
-@@ -230,7 +228,7 @@ nomatch:
+@@ -232,7 +230,7 @@ nomatch:
  static GSList *getPids() {
  GSList *pids = NULL;
  FILE *ps_output;
diff --git pkg/PLIST pkg/PLIST
index 6634a4414b8..def38674c15 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,7 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.7 2018/06/27 21:04:23 espie Exp $
 @bin bin/tilda
-share/appdata/
-share/appdata/tilda.appdata.xml
 share/applications/tilda.desktop
 share/doc/tilda/
 share/doc/tilda/README.md
@@ -16,6 +14,7 @@ share/locale/fr/LC_MESSAGES/tilda.mo
 share/locale/hu/LC_MESSAGES/tilda.mo
 share/locale/it/LC_MESSAGES/tilda.mo
 share/locale/lt/LC_MESSAGES/tilda.mo
+share/locale/nb/LC_MESSAGES/tilda.mo
 share/locale/pl/LC_MESSAGES/tilda.mo
 share/locale/pt/LC_MESSAGES/tilda.mo
 share/locale/pt_BR/LC_MESSAGES/tilda.mo
@@ -25,6 +24,9 @@ share/locale/sl/LC_MESSAGES/tilda.mo
 share/locale/sv/LC_MESSAGES/tilda.mo
 share/locale/tr/LC_MESSAGES/tilda.mo
 share/locale/zh_CN/LC_MESSAGES/tilda.mo
+share/locale/zh_TW/LC_MESSAGES/tilda.mo
+share/metainfo/
+share/metainfo/tilda.appdata.xml
 share/pixmaps/
 share/pixmaps/tilda.png
 @tag update-desktop-database

Re: UPDATE: x11/tilda

2016-11-06 Thread Jeremie Courreges-Anglas 
Davide Gerhard  writes:

> hello ports@,
>
> in attachment the patch that bump tilda to 1.3.3 version.
>
> I did some changes:
> - update HOMEPAGE
> - the project moves to github so I use GH_*
> - re-check of WANTLIB with port-lib-depends-check
> - use of vte3 
> - autoconf/automake to build
> - deleted patches/{patch-Makefile_in,patch-src_key_grabber_c,\
>  patch-src_tomboykeybinder_h,patch-src_wizard_c}
>   because many of those all already included in upstream
>
>
> I update the port because with i3 (and maybe others) the windows are not
> displayed correctly.
>
> tested on amd64 only.
>
>
> Comments?

Committed with the following tweaks:
- Makefile ordering
- don't merge patch and configure steps
- different solution for the tilda.c feature test macros issue

Thanks,

> kind regards,
> /davide
>
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

UPDATE: x11/tilda

2016-10-13 Thread Davide Gerhard 
hello ports@,

in attachment the patch that bump tilda to 1.3.3 version.

I did some changes:
- update HOMEPAGE
- the project moves to github so I use GH_*
- re-check of WANTLIB with port-lib-depends-check
- use of vte3 
- autoconf/automake to build
- deleted patches/{patch-Makefile_in,patch-src_key_grabber_c,\
 patch-src_tomboykeybinder_h,patch-src_wizard_c}
  because many of those all already included in upstream


I update the port because with i3 (and maybe others) the windows are not
displayed correctly.

tested on amd64 only.


Comments?

kind regards,
/davide
Index: Makefile
===
RCS file: /cvs/ports/x11/tilda/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile27 Aug 2016 18:04:44 -  1.21
+++ Makefile13 Oct 2016 11:17:39 -
@@ -2,35 +2,47 @@
 
 COMMENT=   drop-down terminal emulator
 
-DISTNAME=  tilda-0.9.6
-REVISION=  9
+DISTNAME=  tilda-1.3.3
 CATEGORIES=x11
 
-HOMEPAGE=  http://tilda.sourceforge.net/
+HOMEPAGE=  https://github.com/lanoxx/tilda
 
-# GPL
+# GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tilda/}
-
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 c cairo confuse fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0
-WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv intl pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread vte xml2 z
-
+GH_ACCOUNT=lanoxx
+GH_PROJECT=tilda
+GH_TAGNAME=${DISTNAME}
+
+WANTLIB += X11 c confuse gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gobject-2.0 gtk-3 intl pango-1.0 vte-2.91
+ 
 RUN_DEPENDS=   devel/desktop-file-utils
 LIB_DEPENDS=   devel/gettext \
devel/libconfuse \
-   devel/libglade2 \
-   devel/vte
+   devel/vte3 \
+
+# autogen.sh needs autopoint (gettext)
+BUILD_DEPENDS=  ${MODGNU_AUTOCONF_DEPENDS} \
+${MODGNU_AUTOMAKE_DEPENDS} \
+   devel/gettext-tools
+
+AUTOCONF_VERSION=   2.69
+AUTOMAKE_VERSION=   1.15
 
 USE_GMAKE= Yes
 
 CONFIGURE_STYLE=   gnu
 
+post-patch:
+   @cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh --disable-rpath
+
+# done by autogen.sh
+do-configure:
+
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tilda
-   ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tilda
+   ${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/tilda
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tilda/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:16:02 -  1.4
+++ distinfo13 Oct 2016 11:17:39 -
@@ -1,2 +1,2 @@
-SHA256 (tilda-0.9.6.tar.gz) = s70PY+uDpQAe8mBWyhFuX4AF1FT4+CqU8zSGiGIGhBE=
-SIZE (tilda-0.9.6.tar.gz) = 307517
+SHA256 (tilda-1.3.3.tar.gz) = cbqlVyxJjls+lPW1foEYwe8P2uommlskJSCOGt7ChLE=
+SIZE (tilda-1.3.3.tar.gz) = 671222
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in   28 Apr 2008 14:50:20 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2008/04/28 14:50:20 jasper Exp $
 Makefile.in.orig   Mon Apr 28 12:41:33 2008
-+++ Makefile.inMon Apr 28 15:15:40 2008
-@@ -319,12 +319,12 @@ uninstall-PixmapsDATA:
-   done
- install-dataDATA: $(data_DATA)
-   @$(NORMAL_INSTALL)
--  test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)"
-+  test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-   @list='$(data_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
--echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
--$(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
-+echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-+$(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
-   done
- 
- uninstall-dataDATA:
Index: patches/patch-src-tilda_c
===
RCS file: /cvs/ports/x11/tilda/patches/patch-src-tilda_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src-tilda_c
--- patches/patch-src-tilda_c   11 Feb 2008 09:03:31 -  1.2
+++ patches/patch-src-tilda_c   13 Oct 2016 11:17:39 -
@@ -10,3 +10,13 @@ $OpenBSD: patch-src-tilda_c,v 1.2 2008/0
  gchar buf[16]; /* Really shouldn't need more than 6 */