CVS commit: pkgsrc/x11/tabbed

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sat Aug  9 15:56:03 UTC 2025

Modified Files:
        pkgsrc/x11/tabbed: Makefile PLIST distinfo
        pkgsrc/x11/tabbed/patches: patch-Makefile

Log Message:
tabbed: Update to 0.9

Changes:
0.9
---
- Bug fixes and improvements

0.8
---
- Add xembed(1)
- Bug fixes and improvements


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/tabbed/Makefile \
    pkgsrc/x11/tabbed/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/tabbed/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/tabbed/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/tabbed/Makefile
diff -u pkgsrc/x11/tabbed/Makefile:1.5 pkgsrc/x11/tabbed/Makefile:1.6
--- pkgsrc/x11/tabbed/Makefile:1.5      Sun Nov 12 13:24:31 2023
+++ pkgsrc/x11/tabbed/Makefile  Sat Aug  9 15:56:02 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2023/11/12 13:24:31 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2025/08/09 15:56:02 leot Exp $
 
-DISTNAME=      tabbed-0.7
-PKGREVISION=   2
+DISTNAME=      tabbed-0.9
 CATEGORIES=    x11
 MASTER_SITES=  https://dl.suckless.org/tools/
 
@@ -14,19 +13,14 @@ USE_TOOLS+= pkg-config
 
 SUBST_CLASSES+=                makefile
 SUBST_STAGE.makefile=  pre-configure
-SUBST_MESSAGE.makefile=        Fixing config.mk
-SUBST_FILES.makefile=  config.mk
+SUBST_MESSAGE.makefile=        Fixing Makefile
+SUBST_FILES.makefile=  Makefile
 SUBST_SED.makefile+=   -e 's,/usr/local,${PREFIX},g'
 SUBST_SED.makefile+=   -e 's,share/man,${PKGMANDIR},g'
 SUBST_SED.makefile+=   -e 's,/usr/X11R6,${X11BASE},'
-SUBST_SED.makefile+=   -e 's,^CFLAGS = ,CFLAGS += ,'
-SUBST_SED.makefile+=   -e 's,^LDFLAGS = ,LDFLAGS += ,'
-SUBST_SED.makefile+=   -e 's/-I$${FREETYPEINC}/$${FREETYPEINC}/'
 SUBST_SED.makefile+=   -e 's,^FREETYPEINC *=.*,FREETYPEINC != freetype-config --cflags,'
-SUBST_SED.makefile+=   -e 's/cc/${CC:Q}/'
-SUBST_SED.makefile+=   -e '/^CFLAGS/ s/-Os//'
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/doc/tabbed
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
Index: pkgsrc/x11/tabbed/distinfo
diff -u pkgsrc/x11/tabbed/distinfo:1.5 pkgsrc/x11/tabbed/distinfo:1.6
--- pkgsrc/x11/tabbed/distinfo:1.5      Sun Oct  9 12:32:02 2022
+++ pkgsrc/x11/tabbed/distinfo  Sat Aug  9 15:56:02 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2022/10/09 12:32:02 leot Exp $
+$NetBSD: distinfo,v 1.6 2025/08/09 15:56:02 leot Exp $
 
-BLAKE2s (tabbed-0.7.tar.gz) = b80e87add064b3c8473e8daa05abd23c953d6d73e936459763a92c5886a2eab1
-SHA512 (tabbed-0.7.tar.gz) = 770420935fd152e10bef59e29eeb8125ee181993691c6c5f03baf311bd685c2b5f0ded13854b3715cc60d0f1ae99eceacd3e6cb7e4008c34917ae55c38b436a7
-Size (tabbed-0.7.tar.gz) = 13778 bytes
-SHA1 (patch-Makefile) = 94f9b16abd8e6a4020466c89608284c97ba1fc31
+BLAKE2s (tabbed-0.9.tar.gz) = d523386a534ebb0a1e86c03cb55f95db170bc2f256cdb3d581105d8833e97789
+SHA512 (tabbed-0.9.tar.gz) = 08435b3b7837f2efd4c6a3f8ccea54f89d08c19601d84792f783d0c0f8b8e00721d35f5679b4d71526ef43121f3f8eee160e777d071e17fbe04b610696a684f6
+Size (tabbed-0.9.tar.gz) = 14484 bytes
+SHA1 (patch-Makefile) = 78179634bfffb82a2e26addbe0760f18f7463129

Index: pkgsrc/x11/tabbed/PLIST
diff -u pkgsrc/x11/tabbed/PLIST:1.2 pkgsrc/x11/tabbed/PLIST:1.3
--- pkgsrc/x11/tabbed/PLIST:1.2 Sun Oct  9 12:32:02 2022
+++ pkgsrc/x11/tabbed/PLIST     Sat Aug  9 15:56:02 2025
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2022/10/09 12:32:02 leot Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/08/09 15:56:02 leot Exp $
 bin/tabbed
 bin/xembed
 man/man1/tabbed.1
+man/man1/xembed.1
+share/doc/tabbed/README

Index: pkgsrc/x11/tabbed/patches/patch-Makefile
diff -u pkgsrc/x11/tabbed/patches/patch-Makefile:1.1 pkgsrc/x11/tabbed/patches/patch-Makefile:1.2
--- pkgsrc/x11/tabbed/patches/patch-Makefile:1.1        Sun Oct  9 12:32:03 2022
+++ pkgsrc/x11/tabbed/patches/patch-Makefile    Sat Aug  9 15:56:02 2025
@@ -1,17 +1,18 @@
-$NetBSD: patch-Makefile,v 1.1 2022/10/09 12:32:03 leot Exp $
+$NetBSD: patch-Makefile,v 1.2 2025/08/09 15:56:02 leot Exp $
 
-Avoid to install xembed(1).
+Add needed freetype CFLAGS via freetype-config.
 
-Accidentally not present in tabbed-0.7 distfile.
-
---- Makefile.orig      2022-10-04 17:39:51.000000000 +0000
+--- Makefile.orig      2025-08-09 15:48:02.812273593 +0000
 +++ Makefile
-@@ -51,8 +51,6 @@ install: all
-       @mkdir -p "${DESTDIR}${MANPREFIX}/man1"
-       @sed "s/VERSION/${VERSION}/g" < tabbed.1 > "${DESTDIR}${MANPREFIX}/man1/tabbed.1"
-       @chmod 644 "${DESTDIR}${MANPREFIX}/man1/tabbed.1"
--      @sed "s/VERSION/${VERSION}/g" < xembed.1 > "${DESTDIR}${MANPREFIX}/man1/xembed.1"
--      @chmod 644 "${DESTDIR}${MANPREFIX}/man1/xembed.1"
+@@ -8,8 +8,10 @@ PREFIX = /usr/local
+ MANPREFIX = ${PREFIX}/share/man
+ DOCPREFIX = ${PREFIX}/share/doc/${NAME}
+ 
++FREETYPE_CFLAGS != freetype-config --cflags
++
+ # use system flags.
+-TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/include/freetype2 ${CFLAGS}
++TABBED_CFLAGS = -I/usr/X11R6/include ${FREETYPE_CFLAGS} ${CFLAGS}
+ TABBED_LDFLAGS = -L/usr/X11R6/lib -lX11 -lfontconfig -lXft ${LDFLAGS}
+ TABBED_CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700L
  
- uninstall:
-       @echo removing executable files from ${DESTDIR}${PREFIX}/bin