CVS commit: pkgsrc/x11/drawterm

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Thu Mar  2 12:55:00 UTC 2023

Modified Files:
        pkgsrc/x11/drawterm: Makefile distinfo

Log Message:
x11/drawterm: update to latest snapshot.

Further simplify Makefile and avoid to override pkgsrc defaults wherever
possible. Use PTHREAD_AUTO_VARS to handle pthread flags instead of
relying on package self-defined os-dependent choices.

Sync package with most recent upstream commit (20230224).
This pulls some noteworthy changes and fixes:

* libmemdraw: update draw.c from 9front
* make USED() macro cast to void, so it works with non-scalars.
* devcons: cleanup kbdputc().
* keyboard.h: update from 9front.
* libauthsrv: better passtodeskey().
* clear parentesis warning from GCC in libc, devdraw, libsec, libip.
* libsec: fix inconsistent prototypes for des.
* devfs: create handle OEXCL, mask permissions with parent directory,
  fix leaks.
* Remove unused Screeninfo screen struct.
* x11: Fix colormap allocation.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/drawterm/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/drawterm/distinfo

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

Modified files:

Index: pkgsrc/x11/drawterm/Makefile
diff -u pkgsrc/x11/drawterm/Makefile:1.5 pkgsrc/x11/drawterm/Makefile:1.6
--- pkgsrc/x11/drawterm/Makefile:1.5    Sun Dec 18 17:43:28 2022
+++ pkgsrc/x11/drawterm/Makefile        Thu Mar  2 12:55:00 2023
@@ -1,63 +1,56 @@
-# $NetBSD: Makefile,v 1.5 2022/12/18 17:43:28 vins Exp $
+# $NetBSD: Makefile,v 1.6 2023/03/02 12:55:00 vins Exp $
 
 DISTNAME=      snap
-PKGVER=                20221013
+PKGVER=                20230224
 PKGNAME=       drawterm-${PKGVER}
 CATEGORIES=    x11 plan9
 DIST_SUBDIR=   ${PKGNAME_NOREV}
-MASTER_SITES=  https://git.9front.org/git/plan9front/drawterm/65e8a26e1dac4a0f589f615126ad87a92c9c11ab/
+MASTER_SITES=  https://git.9front.org/git/plan9front/drawterm/ed9cff5a4c39322744c4708699c9ae6651b7c9ab/
 
 MAINTAINER=    vins%NetBSD.org@localhost
 HOMEPAGE=      https://drawterm.9front.org/
 COMMENT=       Utility to connect to Plan9 CPU servers
 LICENSE=       mit
 
-USE_LANGUAGES= c c99
+PTHREAD_AUTO_VARS=     yes
+
+CFLAGS+=       -I${WRKSRC} -I${WRKSRC}/include -I${WRKSRC}/kern
 
 MAKE_FLAGS+=   CC=${CC:Q}
 MAKE_FLAGS+=   X11=${X11BASE}
 MAKE_FLAGS+=   CFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
+MAKE_FLAGS+=   LDADD="-lX11 -lXt -lm ${EXTRA_LIBS}"
 MAKE_FLAGS+=   RANLIB=${RANLIB:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${PKGSRC_COMPILER:Mgcc}
-CFLAGS+=       -Wall -Wno-missing-braces -ggdb
-CFLAGS+=       -I${WRKSRC} -I${WRKSRC}/include -I${WRKSRC}/kern
-CFLAGS+=       -c -I${X11}/include -D_THREAD_SAFE ${PTHREAD} -O2
-LDFLAGS+=      ${PTHREAD} -lpthread
+CFLAGS+=       -Wall -Wno-missing-braces -ggdb -c
 .else
-CFLAGS+=       -I{WRKSRC} -I${WRKSRC}/include -I${WRKSRC}/kern
-CFLAGS+=       -g -c -I${X11}/include -D_THREAD_SAFE -O2
-LDFLAGS+=      -lpthread
+CFLAGS+=       -g -c
 .endif
 
 .if ${OPSYS:M*BSD}
 MAKE_FLAGS+=   CONF=${LOWER_OPSYS}
 .  if ${OPSYS} == "OpenBSD"
-LD_ADD=                "-lX11 -lXt -ggdb -lsndio"
+EXTRA_LIBS=    -lsndio
 .  elif ${OPSYS} == "NetBSD"
-LD_ADD=                "-lX11 -lXt -ggdb -lossaudio"
-.  else
-LD_ADD=                "-lX11 -lXt -ggdb"
+EXTRA_LIBS=    -lossaudio
 .  endif
 
 .elif ${OPSYS} == "Linux"
 .include "../../audio/alsa-lib/buildlink3.mk"
 MAKE_FLAGS+=   CONF=unix
 MAKE_FLAGS+=   AUDIO=alsa
-LD_ADD=                "-lX11 -lXt -ggdb -lm -lasound"
+EXTRA_LIBS=    -lasound
 
 .elif ${OPSYS} == "Darwin"
 MAKE_FLAGS+=   CONF=osx-x11
-MAKE_FLAGS+=   PTHREAD=''
-LD_ADD=                "-lX11 -lXt -ggdb"
 
 .elif ${OPSYS} == "IRIX" && !empty(PKGSRC_COMPILER:Mmipspro*)
 MAKE_FLAGS+=   CONF=irix
 MAKE_FLAGS+=   CFLAGS+=-DIRIX
-LD_ADD=                "-lX11 -lXt -g -lpthread"
 .endif
 
 .if ${OPSYS} == "SunOS"
@@ -66,7 +59,7 @@ SUBST_STAGE.paths=    pre-configure
 SUBST_FILES.paths+=    Make.unix
 SUBST_SED.paths=       -e 's,i.86/386,i86pc/amd64,'
 
-LD_ADD=                "-lX11 -lXt -lrt -lpthread -lsocket -lnsl"
+EXTRA_LIBS=            -lrt -lsocket -lnsl
 
 .  if ${OPSYS_VERSION} <= 051000
 MAKE_FLAGS+=   AUDIO=sun
@@ -81,18 +74,15 @@ MAKE_FLAGS+=        CONF=unix
 .  endif
 .endif
 
-.if defined(LD_ADD)
-MAKE_FLAGS+=   LDADD=${LD_ADD}
-.endif
-
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 WRKSRC=        ${WRKDIR}/drawterm
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/drawterm ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/drawterm.1                                     \
-       ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_PROGRAM} ${WRKSRC}/drawterm           \
+               ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/drawterm.1             \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"

Index: pkgsrc/x11/drawterm/distinfo
diff -u pkgsrc/x11/drawterm/distinfo:1.2 pkgsrc/x11/drawterm/distinfo:1.3
--- pkgsrc/x11/drawterm/distinfo:1.2    Sat Nov  5 16:12:49 2022
+++ pkgsrc/x11/drawterm/distinfo        Thu Mar  2 12:55:00 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2022/11/05 16:12:49 pin Exp $
+$NetBSD: distinfo,v 1.3 2023/03/02 12:55:00 vins Exp $
 
-BLAKE2s (drawterm-20221013/snap.tar.gz) = bef816dbe6204fa7eb796e4f10be6d1a129fc61ee0fd61451d12868c538be6ef
-SHA512 (drawterm-20221013/snap.tar.gz) = dd750e625f8b8ecb3f3e2a95d62c86c38fa6c84e37d38467947e43d8c83cd1295823241c7baf5f51a0551386377fd2a5c9ced754beee5b9b027d18edb0ffcea8
-Size (drawterm-20221013/snap.tar.gz) = 614945 bytes
+BLAKE2s (drawterm-20230224/snap.tar.gz) = 12f8a08abe09b8ce7107153654d424c29534fc8744fe49e3600b65ad3646eda3
+SHA512 (drawterm-20230224/snap.tar.gz) = 2a2689c72c518d5855ab22f51787d6b253d02ed3e343d660c1679236bfe9c7a546ab107eb5850f9258b9702480d16392b96d287c2be0398b638c2fc260cd2ed4
+Size (drawterm-20230224/snap.tar.gz) = 615374 bytes