pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/drawterm
Module Name: pkgsrc
Committed By: vins
Date: Sun Oct 12 13:42:33 UTC 2025
Modified Files:
pkgsrc/x11/drawterm: Makefile distinfo
Added Files:
pkgsrc/x11/drawterm/patches: patch-Make.pkgsrc patch-include_auth.h
Log Message:
x11/drawterm: package revision
Long due skimming of an overly complex Makefile.
Bump revision.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/drawterm/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/drawterm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/drawterm/patches/patch-Make.pkgsrc \
pkgsrc/x11/drawterm/patches/patch-include_auth.h
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.10 pkgsrc/x11/drawterm/Makefile:1.11
--- pkgsrc/x11/drawterm/Makefile:1.10 Mon Sep 8 11:03:09 2025
+++ pkgsrc/x11/drawterm/Makefile Sun Oct 12 13:42:33 2025
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2025/09/08 11:03:09 vins Exp $
+# $NetBSD: Makefile,v 1.11 2025/10/12 13:42:33 vins Exp $
DISTNAME= snap
-PKGREVSION= 1
-PKGVER= 20240703
+PKGNAME= drawterm-20240703
+PKGREVISION= 2
SNAPSHOT= f11139d4c918802a87730bc14d094670ee4ce572
-PKGNAME= drawterm-${PKGVER}
CATEGORIES= x11 plan9
MASTER_SITES= https://git.9front.org/git/plan9front/drawterm/${SNAPSHOT}/
DIST_SUBDIR= ${PKGNAME_NOREV}
@@ -14,70 +13,31 @@ HOMEPAGE= https://drawterm.9front.org/
COMMENT= Utility to connect to Plan9 CPU servers
LICENSE= mit
-PTHREAD_AUTO_VARS= yes
+USE_TOOLS+= sed
-CFLAGS+= -I${WRKSRC} -I${WRKSRC}/include -I${WRKSRC}/kern
+PTHREAD_AUTO_VARS= yes
+PTHREAD_OPTS= require
-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}
+MAKE_FLAGS+= CONF=pkgsrc CC=${CC:Q} X11=${X11BASE} \
+ RANLIB=${RANLIB:Q} LDADD=${LIBS:Q} \
+ PTHREAD=${PTHREAD_CFLAGS:Q}
+
+CFLAGS.SunOS+= -D__EXTENSIONS__
+
+LIBS+= -lX11 -lXt -lm
+LIBS.OpenBSD+= -lsndio
+LIBS.NetBSD+= -lossaudio
+LIBS.Linux+= -lasound
+LIBS.SunOS+= -lrt -lsocket -lnsl
-.include "../../mk/compiler.mk"
.include "../../mk/bsd.prefs.mk"
-.if ${PKGSRC_COMPILER:Mgcc}
-CFLAGS+= -Wall -Wno-missing-braces -ggdb -c
-.else
-CFLAGS+= -g -c
-.endif
-
-.if ${OPSYS:M*BSD}
-MAKE_FLAGS+= CONF=${LOWER_OPSYS}
-. if ${OPSYS} == "OpenBSD"
-EXTRA_LIBS= -lsndio
-. elif ${OPSYS} == "NetBSD"
-EXTRA_LIBS= -lossaudio
-. endif
-
+.if ${OPSYS:M*BSD} || ${OPSYS} == "SunOS"
+.include "../../mk/oss.buildlink3.mk"
+MAKE_FLAGS+= AUDIO=unix
.elif ${OPSYS} == "Linux"
.include "../../audio/alsa-lib/buildlink3.mk"
-MAKE_FLAGS+= CONF=unix
MAKE_FLAGS+= AUDIO=alsa
-EXTRA_LIBS= -lasound
-
-.elif ${OPSYS} == "Darwin"
-MAKE_FLAGS+= CONF=osx-x11
-
-.elif ${OPSYS} == "IRIX" && !empty(PKGSRC_COMPILER:Mmipspro*)
-MAKE_FLAGS+= CONF=irix
-MAKE_FLAGS+= CFLAGS+=-DIRIX
-.endif
-
-.if ${OPSYS} == "SunOS"
-
-CFLAGS+= -D__EXTENSIONS__
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths+= Make.unix
-SUBST_SED.paths= -e 's,i.86/386,i86pc/amd64,'
-
-EXTRA_LIBS= -lrt -lsocket -lnsl
-
-. if ${OPSYS_VERSION} <= 051000
-MAKE_FLAGS+= AUDIO=sun
-. else
-MAKE_FLAGS+= AUDIO=unix
-. endif
-
-. if !empty(PKGSRC_COMPILER:Msunpro)
-MAKE_FLAGS+= CONF=sun
-. else
-MAKE_FLAGS+= CONF=unix
-. endif
.endif
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
@@ -92,6 +52,5 @@ do-install:
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/drawterm/distinfo
diff -u pkgsrc/x11/drawterm/distinfo:1.7 pkgsrc/x11/drawterm/distinfo:1.8
--- pkgsrc/x11/drawterm/distinfo:1.7 Wed Sep 10 14:35:46 2025
+++ pkgsrc/x11/drawterm/distinfo Sun Oct 12 13:42:33 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2025/09/10 14:35:46 vins Exp $
+$NetBSD: distinfo,v 1.8 2025/10/12 13:42:33 vins Exp $
BLAKE2s (drawterm-20240703/snap.tar.gz) = 58fd45c170a391d353e71af54795e5fae03260abe46fe8de3d0a4389b590a940
SHA512 (drawterm-20240703/snap.tar.gz) = 0f63bb727d3511873ceea5a27a0d095e10e93bdaaba2afecf1568b468375980e239a3b17b83ed1964e249d9eeda77adbceef25b729ab78c54304a4908a80e328
Size (drawterm-20240703/snap.tar.gz) = 615366 bytes
+SHA1 (patch-Make.pkgsrc) = 56ea2837774f1c01229f64a191bfe9faebc02b4d
+SHA1 (patch-include_auth.h) = e865dfe781dc57a26d85198aaf4b85f06778d2ea
Added files:
Index: pkgsrc/x11/drawterm/patches/patch-Make.pkgsrc
diff -u /dev/null pkgsrc/x11/drawterm/patches/patch-Make.pkgsrc:1.1
--- /dev/null Sun Oct 12 13:42:33 2025
+++ pkgsrc/x11/drawterm/patches/patch-Make.pkgsrc Sun Oct 12 13:42:33 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-Make.pkgsrc,v 1.1 2025/10/12 13:42:33 vins Exp $
+
+Standard configuration for pkgsrc.
+
+--- Make.pkgsrc.orig 2025-10-12 13:31:59.820674338 +0000
++++ Make.pkgsrc
+@@ -0,0 +1,15 @@
++# pkgsrc
++CFLAGS += -Wall -Wno-missing-braces -Wno-parentheses \
++ -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern \
++ -c -I$(X11)/include -D_THREAD_SAFE
++O = o
++OS = posix
++GUI = x11
++TARG = drawterm
++AUDIO ?= none
++
++all: default
++
++libmachdep.a:
++ arch=`uname -m|sed 's/i.86/386/; s/Power Macintosh/power/; s/x86_64/amd64/; s/i86pc/amd64/; s/aarch64/arm64/; s/sparc64/sun4u/'`; \
++ (cd posix-$$arch && make)
Index: pkgsrc/x11/drawterm/patches/patch-include_auth.h
diff -u /dev/null pkgsrc/x11/drawterm/patches/patch-include_auth.h:1.1
--- /dev/null Sun Oct 12 13:42:33 2025
+++ pkgsrc/x11/drawterm/patches/patch-include_auth.h Sun Oct 12 13:42:33 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-include_auth.h,v 1.1 2025/10/12 13:42:33 vins Exp $
+
+Prevent redefinition of MAXNAMELEN on SunOS.
+
+--- include/auth.h.orig 2024-07-03 15:30:56.000000000 +0000
++++ include/auth.h
+@@ -17,7 +17,7 @@ typedef struct AuthRpc AuthRpc;
+ enum
+ {
+ MAXCHLEN= 256, /* max challenge length */
+- MAXNAMELEN= 256, /* maximum name length */
++ MAXNMLEN= 256, /* maximum name length */
+ MD5LEN= 16,
+
+ ARok = 0, /* rpc return values */
+@@ -63,7 +63,7 @@ struct Chalstate
+ /* for implementation only */
+ int afd; /* to factotum */
+ AuthRpc *rpc; /* to factotum */
+- char userbuf[MAXNAMELEN]; /* temp space if needed */
++ char userbuf[MAXNMLEN]; /* temp space if needed */
+ int userinchal; /* user was sent to obtain challenge */
+ };
+
Home |
Main Index |
Thread Index |
Old Index