pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/libslang
Module Name: pkgsrc
Committed By: ktnb
Date: Mon Jan 6 21:36:25 UTC 2025
Modified Files:
pkgsrc/devel/libslang: DESCR Makefile PLIST buildlink3.mk distinfo
Added Files:
pkgsrc/devel/libslang: options.mk
pkgsrc/devel/libslang/patches: patch-autoconf_slangpc.in
patch-configure patch-demo_Makefile.in patch-modules_fork-module.c
patch-src_slang.h patch-src_slproc.c
Removed Files:
pkgsrc/devel/libslang/patches: patch-aa patch-ab patch-ac patch-ad
Log Message:
libslang: update to 2.3.3
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libslang/DESCR
cvs rdiff -u -r1.74 -r1.75 pkgsrc/devel/libslang/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/libslang/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/libslang/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/libslang/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libslang/options.mk
cvs rdiff -u -r1.17 -r0 pkgsrc/devel/libslang/patches/patch-aa
cvs rdiff -u -r1.8 -r0 pkgsrc/devel/libslang/patches/patch-ab
cvs rdiff -u -r1.5 -r0 pkgsrc/devel/libslang/patches/patch-ac
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/libslang/patches/patch-ad
cvs rdiff -u -r0 -r1.1 \
pkgsrc/devel/libslang/patches/patch-autoconf_slangpc.in \
pkgsrc/devel/libslang/patches/patch-configure \
pkgsrc/devel/libslang/patches/patch-demo_Makefile.in \
pkgsrc/devel/libslang/patches/patch-modules_fork-module.c \
pkgsrc/devel/libslang/patches/patch-src_slang.h \
pkgsrc/devel/libslang/patches/patch-src_slproc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/libslang/DESCR
diff -u pkgsrc/devel/libslang/DESCR:1.1 pkgsrc/devel/libslang/DESCR:1.2
--- pkgsrc/devel/libslang/DESCR:1.1 Thu Nov 1 01:24:42 2001
+++ pkgsrc/devel/libslang/DESCR Mon Jan 6 21:36:24 2025
@@ -1,17 +1,24 @@
- S-Lang is a C programmer's library that includes routines for the rapid
- development of sophisticated, user friendly, multi-platform applications.
- The S-Lang library includes the following:
-
- Low level tty input routines for reading single characters at a time.
- Keymap routines for defining keys and manipulating multiple keymaps.
- High level screen management routines for manipulating both
- monochrome and color terminals. These routines are very
- efficient.
- Low level terminal-independent routines for manipulating the display
- of a terminal.
- Routines for reading single line input with line editing and recall
+S-Lang is a C programmer's library that includes routines for the rapid
+development of sophisticated, user friendly, multi-platform applications.
+
+The S-Lang library includes the following:
+
+ - Low level tty input routines for reading single characters at a
+ time, as well as low-level terminal-independent routines for
+ manipulating the display of a terminal.
+
+ - Keymap routines for defining keys and manipulating multiple
+ keymaps.
+
+ - High level screen management routines for manipulating both
+ monochrome and color terminals. These routines are very efficient.
+
+ - Routines for reading single line input with line editing and recall
capabilities.
- Searching functions: both ordinary searches and regular expression
+
+ - Searching functions: both ordinary searches and regular expression
searches.
- An embedded stack-based language interpreter with a C-like syntax.
- A malloc debugging package
+
+ - An embedded stack-based language interpreter with a C-like syntax.
+
+ - A malloc debugging package
Index: pkgsrc/devel/libslang/Makefile
diff -u pkgsrc/devel/libslang/Makefile:1.74 pkgsrc/devel/libslang/Makefile:1.75
--- pkgsrc/devel/libslang/Makefile:1.74 Sun Jan 26 17:30:59 2020
+++ pkgsrc/devel/libslang/Makefile Mon Jan 6 21:36:24 2025
@@ -1,34 +1,51 @@
-# $NetBSD: Makefile,v 1.74 2020/01/26 17:30:59 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.75 2025/01/06 21:36:24 ktnb Exp $
-DISTNAME= slang-1.4.9
+DISTNAME= slang-2.3.3
PKGNAME= lib${DISTNAME}
-PKGREVISION= 7
CATEGORIES= devel
-MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/
-MASTER_SITES+= ftp://ftp.ntua.gr/pub/lang/slang/slang/v1.4/
+MASTER_SITES= https://www.jedsoft.org/releases/slang/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.s-lang.org/
+HOMEPAGE= https://www.jedsoft.org/slang/
COMMENT= Routines for rapid alpha-numeric terminal applications development
+LICENSE= gnu-gpl-v2
MAKE_JOBS_SAFE= no
USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-DLOPEN_REQUIRE_PTHREADS= no
+CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+= --without-x
+CONFIGURE_ARGS+= --with-z=${BUILDLINK_PREFIX.zlib}
+
+PKGCONFIG_OVERRIDE+= autoconf/slangpc.in
+
+DLOPEN_REQUIRE_PTHREADS= no
+
+EGDIR= ${PREFIX}/share/examples/libslang
+CONF_FILES+= ${EGDIR}/slsh.rc ${PKG_SYSCONFDIR}/slsh.rc
+
+INSTALL_MAKE_FLAGS+= DEST_SLSH_CONF_DIR=${DESTDIR}/${EGDIR}
.include "../../mk/termcap.buildlink3.mk"
-.if ${TERMCAP_TYPE} == "termcap"
-CONFIGURE_ENV+= TERMCAP=${BUILDLINK_LDADD.termcap:Q}
-CONFIGURE_ENV+= MISC_TERMINFO_DIRS=${PREFIX:Q}/share/terminfo
-.else
-CONFIGURE_ENV+= TERMCAP=
-CONFIGURE_ENV+= MISC_TERMINFO_DIRS=${BUILDLINK_PREFIX.termcap:Q}/share/terminfo
-.endif
+#CONFIGURE_ENV+= TERMCAP=
+CONFIGURE_ENV+= MISC_TERMINFO_DIRS=${BUILDLINK_PREFIX.termcap}/share/terminfo
+
+REPLACE_INTERPRETER+= slsh
+REPLACE.slsh.old= slsh
+REPLACE.slsh.new= ${PREFIX}/bin/slsh
+REPLACE_FILES.slsh= slsh/scripts/jpegsize slsh/scripts/lsrpm \
+ slsh/scripts/sldb slsh/scripts/slprof \
+ slsh/scripts/svnsh slsh/scripts/slstkchk \
+ slsh/scripts/slcov
+
+USE_FEATURES= # empty (used in options.mk)
+.include "options.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/libslang/PLIST
diff -u pkgsrc/devel/libslang/PLIST:1.5 pkgsrc/devel/libslang/PLIST:1.6
--- pkgsrc/devel/libslang/PLIST:1.5 Mon Jan 1 22:29:24 2018
+++ pkgsrc/devel/libslang/PLIST Mon Jan 6 21:36:24 2025
@@ -1,14 +1,162 @@
-@comment $NetBSD: PLIST,v 1.5 2018/01/01 22:29:24 rillig Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/01/06 21:36:24 ktnb Exp $
+bin/slsh
include/slang.h
include/slcurses.h
-lib/libslang.la
-share/doc/slang/COPYING
-share/doc/slang/COPYING.ART
-share/doc/slang/COPYING.GPL
-share/doc/slang/COPYRIGHT
-share/doc/slang/changes.txt
-share/doc/slang/cref.txt
-share/doc/slang/cslang.txt
-share/doc/slang/slang.txt
-share/doc/slang/slangdoc.html
-share/doc/slang/slangfun.txt
+lib/libslang.so
+lib/libslang.so.2
+lib/libslang.so.${PKGVERSION}
+lib/pkgconfig/slang.pc
+lib/slang/v2/modules/base64-module.so
+lib/slang/v2/modules/chksum-module.so
+lib/slang/v2/modules/csv-module.so
+lib/slang/v2/modules/fcntl-module.so
+lib/slang/v2/modules/fork-module.so
+lib/slang/v2/modules/histogram-module.so
+lib/slang/v2/modules/iconv-module.so
+lib/slang/v2/modules/json-module.so
+${PLIST.oniguruma}lib/slang/v2/modules/onig-module.la
+${PLIST.pcre}lib/slang/v2/modules/pcre-module.la
+${PLIST.png}lib/slang/v2/modules/png-module.la
+lib/slang/v2/modules/rand-module.so
+lib/slang/v2/modules/select-module.so
+lib/slang/v2/modules/slsmg-module.so
+lib/slang/v2/modules/socket-module.so
+lib/slang/v2/modules/stats-module.so
+lib/slang/v2/modules/sysconf-module.so
+lib/slang/v2/modules/termios-module.so
+lib/slang/v2/modules/varray-module.so
+lib/slang/v2/modules/zlib-module.so
+man/man1/slsh.1
+share/doc/slang/v2/COPYING
+share/doc/slang/v2/changes.txt
+share/doc/slang/v2/cref.txt
+share/doc/slang/v2/cslang.txt
+share/doc/slang/v2/slang.txt
+share/doc/slang/v2/slangdoc.html
+share/doc/slang/v2/slangfun.txt
+share/doc/slsh/html/slshfun-1.html
+share/doc/slsh/html/slshfun-10.html
+share/doc/slsh/html/slshfun-11.html
+share/doc/slsh/html/slshfun-12.html
+share/doc/slsh/html/slshfun-13.html
+share/doc/slsh/html/slshfun-2.html
+share/doc/slsh/html/slshfun-3.html
+share/doc/slsh/html/slshfun-4.html
+share/doc/slsh/html/slshfun-5.html
+share/doc/slsh/html/slshfun-6.html
+share/doc/slsh/html/slshfun-7.html
+share/doc/slsh/html/slshfun-8.html
+share/doc/slsh/html/slshfun-9.html
+share/doc/slsh/html/slshfun.html
+share/examples/libslang/slsh.rc
+share/slsh/arrayfuns.sl
+share/slsh/autoload.sl
+share/slsh/base64.sl
+share/slsh/chksum.sl
+share/slsh/cmaps/cool.map
+share/slsh/cmaps/coolwarm.map
+share/slsh/cmaps/copper.map
+share/slsh/cmaps/cubicl.map
+share/slsh/cmaps/cubicyf.map
+share/slsh/cmaps/drywet.map
+share/slsh/cmaps/ds9b.map
+share/slsh/cmaps/ds9sls.map
+share/slsh/cmaps/edge.map
+share/slsh/cmaps/gebco.map
+share/slsh/cmaps/globe.map
+share/slsh/cmaps/gray.map
+share/slsh/cmaps/haxby.map
+share/slsh/cmaps/hot.map
+share/slsh/cmaps/jet.map
+share/slsh/cmaps/no_green.map
+share/slsh/cmaps/ocean.map
+share/slsh/cmaps/polar.map
+share/slsh/cmaps/rainbow.map
+share/slsh/cmaps/red2green.map
+share/slsh/cmaps/relief.map
+share/slsh/cmaps/sealand.map
+share/slsh/cmaps/seis.map
+share/slsh/cmaps/split.map
+share/slsh/cmaps/topo.map
+share/slsh/cmaps/wysiwyg.map
+share/slsh/cmdopt.sl
+share/slsh/csv.sl
+share/slsh/fcntl.sl
+share/slsh/fork.sl
+share/slsh/fswalk.sl
+share/slsh/glob.sl
+share/slsh/help/arrayfuns.hlp
+share/slsh/help/base64funs.hlp
+share/slsh/help/chksumfuns.hlp
+share/slsh/help/cmdopt.hlp
+share/slsh/help/csvfuns.hlp
+share/slsh/help/forkfuns.hlp
+share/slsh/help/fswalk.hlp
+share/slsh/help/glob.hlp
+share/slsh/help/histfuns.hlp
+share/slsh/help/jsonfuns.hlp
+share/slsh/help/listfuns.hlp
+share/slsh/help/onigfuns.hlp
+share/slsh/help/pcrefuns.hlp
+share/slsh/help/pngfuns.hlp
+share/slsh/help/print.hlp
+share/slsh/help/process.hlp
+share/slsh/help/profile.hlp
+share/slsh/help/randfuns.hlp
+share/slsh/help/readascii.hlp
+share/slsh/help/require.hlp
+share/slsh/help/setfuns.hlp
+share/slsh/help/slsmg.hlp
+share/slsh/help/sockfuns.hlp
+share/slsh/help/statsfuns.hlp
+share/slsh/help/structfuns.hlp
+share/slsh/help/timestamp.hlp
+share/slsh/histogram.sl
+share/slsh/iconv.sl
+share/slsh/json.sl
+share/slsh/listfuns.sl
+share/slsh/onig.sl
+share/slsh/pcre.sl
+share/slsh/png.sl
+share/slsh/print.sl
+share/slsh/process.sl
+share/slsh/profile.sl
+share/slsh/rand.sl
+share/slsh/readascii.sl
+share/slsh/require.sl
+share/slsh/rline/complete.sl
+share/slsh/rline/editfuns.sl
+share/slsh/rline/editor.sl
+share/slsh/rline/emacskeys.sl
+share/slsh/rline/history.sl
+share/slsh/rline/histsrch.sl
+share/slsh/rline/slrline.rc
+share/slsh/rline/vikeys.sl
+share/slsh/scripts/jpegsize
+share/slsh/scripts/lsrpm
+share/slsh/scripts/slcov
+share/slsh/scripts/sldb
+share/slsh/scripts/slprof
+share/slsh/scripts/slstkchk
+share/slsh/scripts/svnsh
+share/slsh/select.sl
+share/slsh/setfuns.sl
+share/slsh/sldb.sl
+share/slsh/sldbcore.sl
+share/slsh/sldbsock.sl
+share/slsh/slshhelp.sl
+share/slsh/slshrl.sl
+share/slsh/slsmg.sl
+share/slsh/socket.sl
+share/slsh/stats.sl
+share/slsh/statslib/ad_test.sl
+share/slsh/statslib/ks_test.sl
+share/slsh/statslib/kuiper.sl
+share/slsh/stkcheck.sl
+share/slsh/structfuns.sl
+share/slsh/sysconf.sl
+share/slsh/termios.sl
+share/slsh/timestamp.sl
+share/slsh/varray.sl
+share/slsh/zlib.sl
+@pkgdir share/slsh/local-packages
Index: pkgsrc/devel/libslang/buildlink3.mk
diff -u pkgsrc/devel/libslang/buildlink3.mk:1.19 pkgsrc/devel/libslang/buildlink3.mk:1.20
--- pkgsrc/devel/libslang/buildlink3.mk:1.19 Sun Jan 7 13:04:06 2018
+++ pkgsrc/devel/libslang/buildlink3.mk Mon Jan 6 21:36:24 2025
@@ -1,13 +1,29 @@
-# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:06 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2025/01/06 21:36:24 ktnb Exp $
BUILDLINK_TREE+= libslang
.if !defined(LIBSLANG_BUILDLINK3_MK)
LIBSLANG_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libslang+= libslang>=1.4.9nb1
-BUILDLINK_ABI_DEPENDS.libslang+= libslang>=1.4.9nb4
-BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
+BUILDLINK_API_DEPENDS.libslang+= libslang>=2.1.3
+BUILDLINK_ABI_DEPENDS.libslang+= libslang>=2.2.4nb3
+BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
+pkgbase:= libslang
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.libslang:Mpng}
+. include "../../graphics/png/buildlink3.mk"
+.endif
+.if ${PKG_BUILD_OPTIONS.libslang:Mpcre}
+. include "../../devel/pcre/buildlink3.mk"
+.endif
+.if ${PKG_BUILD_OPTIONS.libslang:Moniguruma}
+. include "../../textproc/oniguruma/buildlink3.mk"
+.endif
+
+.include "../../mk/termcap.buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
.endif # LIBSLANG_BUILDLINK3_MK
BUILDLINK_TREE+= -libslang
Index: pkgsrc/devel/libslang/distinfo
diff -u pkgsrc/devel/libslang/distinfo:1.14 pkgsrc/devel/libslang/distinfo:1.15
--- pkgsrc/devel/libslang/distinfo:1.14 Tue Oct 26 10:15:28 2021
+++ pkgsrc/devel/libslang/distinfo Mon Jan 6 21:36:24 2025
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 10:15:28 nia Exp $
+$NetBSD: distinfo,v 1.15 2025/01/06 21:36:24 ktnb Exp $
-BLAKE2s (slang-1.4.9.tar.bz2) = 1509140dc7c8f3ade19199f2ef4176ed64caee6b431c166218527f56e413233c
-SHA512 (slang-1.4.9.tar.bz2) = 4581d267decf568e11c09b644d9094feeb57773b68fb0a407a602a91abfc175f2a215620df0a72751e1a051e5eedb70ef1c109cf94c8727a0e27ed0a91b742f5
-Size (slang-1.4.9.tar.bz2) = 631079 bytes
-SHA1 (patch-aa) = 619ed90efc4cb833db2695920f7772fc67df4155
-SHA1 (patch-ab) = 47f7aa6341072f113cbf138c1206d36dbbc59dc9
-SHA1 (patch-ac) = 1ae91c0d5772d3b85c7028eca8decd8c0bc474c5
-SHA1 (patch-ad) = 5d8f0350d473381d5bb0808db60e872b82b0dca4
+BLAKE2s (slang-2.3.3.tar.bz2) = d8ba51ad216a71ec3da2ee5ea994f73223c632c8197a87b5cb1e53b8b9463e61
+SHA512 (slang-2.3.3.tar.bz2) = f882f09e3fcd53427de0f233c9fc3ab15497f2323007be9a084696c8cf810ffe2726cd003149e757df26198b390b9f8c1ff411dc6473513457bd0f94722f8490
+Size (slang-2.3.3.tar.bz2) = 1646311 bytes
+SHA1 (patch-autoconf_slangpc.in) = abfb7a4ce6df4b7c5bf7d319c4cc56f7bd03e209
+SHA1 (patch-configure) = 1f5743569c43bcfebb925b275d7032f853a34943
+SHA1 (patch-demo_Makefile.in) = 9ab953b8d850832f49f8af9bdb397f474af209eb
+SHA1 (patch-modules_fork-module.c) = 25be7b526b2adb90d7b83645cc93fa67743fe86f
+SHA1 (patch-src_slang.h) = 1181b6ce5de5c7c149aa8692dbcded981bda688e
+SHA1 (patch-src_slproc.c) = 5e321481cd983c0c03a4938c6b66dd194f5badb3
Added files:
Index: pkgsrc/devel/libslang/options.mk
diff -u /dev/null pkgsrc/devel/libslang/options.mk:1.1
--- /dev/null Mon Jan 6 21:36:25 2025
+++ pkgsrc/devel/libslang/options.mk Mon Jan 6 21:36:24 2025
@@ -0,0 +1,36 @@
+# $NetBSD: options.mk,v 1.1 2025/01/06 21:36:24 ktnb Exp $
+#
+PKG_OPTIONS_VAR= PKG_OPTIONS.libslang
+PKG_SUPPORTED_OPTIONS= png oniguruma pcre
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS= ${PKG_SUPPORTED_OPTIONS}
+
+.if !empty(PKG_OPTIONS:Mpng)
+CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png}
+PLIST.png= yes
+. include "../../graphics/png/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-png
+.endif
+
+.if !empty(PKG_OPTIONS:Mpcre)
+CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre}
+PLIST.pcre= yes
+. include "../../devel/pcre/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-pcre
+.endif
+
+.if !empty(PKG_OPTIONS:Moniguruma)
+CONFIGURE_ARGS+= --with-onig=${BUILDLINK_PREFIX.oniguruma}
+PLIST.oniguruma= yes
+. include "../../textproc/oniguruma/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-onig
+.endif
+
+.if empty(PKG_OPTIONS:Moniguruma) && empty(PKG_OPTIONS:Mpcre)
+USE_FEATURES+= regcomp
+.endif
Index: pkgsrc/devel/libslang/patches/patch-autoconf_slangpc.in
diff -u /dev/null pkgsrc/devel/libslang/patches/patch-autoconf_slangpc.in:1.1
--- /dev/null Mon Jan 6 21:36:25 2025
+++ pkgsrc/devel/libslang/patches/patch-autoconf_slangpc.in Mon Jan 6 21:36:25 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-autoconf_slangpc.in,v 1.1 2025/01/06 21:36:25 ktnb Exp $
+
+Fix library name.
+
+--- autoconf/slangpc.in.orig 2022-08-05 10:33:27.000000000 +0000
++++ autoconf/slangpc.in
+@@ -7,6 +7,6 @@ Name: slang
+ Description: S-Lang programming library and interpreter
+ URL: http://www.jedsoft.org/slang/
+ Version: @slang_version@
+-Libs: -L${libdir} -lslang
++Libs: -Wl,-R${libdir} -Wl,-R${libdir} -Wl,-R${libdir} -Wl,-R${libdir} -L${libdir} -lslang
+ Libs.private: @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
+ Cflags: -I${includedir}
Index: pkgsrc/devel/libslang/patches/patch-configure
diff -u /dev/null pkgsrc/devel/libslang/patches/patch-configure:1.1
--- /dev/null Mon Jan 6 21:36:25 2025
+++ pkgsrc/devel/libslang/patches/patch-configure Mon Jan 6 21:36:25 2025
@@ -0,0 +1,31 @@
+$NetBSD: patch-configure,v 1.1 2025/01/06 21:36:25 ktnb Exp $
+
+--- configure.orig 2011-04-11 02:37:07.000000000 +0000
++++ configure
+@@ -6787,6 +6787,7 @@ fi
+
+
+ fi
++if false; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for terminfo" >&5
+ $as_echo_n "checking for terminfo... " >&6; }
+ if test "$nc5config" != "no"
+@@ -6812,6 +6813,7 @@ $as_echo "yes" >&6; }
+ break
+ fi
+ done
++fi
+ if test "$TERMCAP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -6857,8 +6859,8 @@ then
+ fi
+ fi
+
+-OBJDIR=$SRCDIR/"\$(ARCH)"objs
+-ELFDIR=$SRCDIR/"\$(ARCH)"elfobjs
++OBJDIR=$SRCDIR/
++ELFDIR=$OBJDIR
+
+
+ missingmodules=""
Index: pkgsrc/devel/libslang/patches/patch-demo_Makefile.in
diff -u /dev/null pkgsrc/devel/libslang/patches/patch-demo_Makefile.in:1.1
--- /dev/null Mon Jan 6 21:36:25 2025
+++ pkgsrc/devel/libslang/patches/patch-demo_Makefile.in Mon Jan 6 21:36:25 2025
@@ -0,0 +1,53 @@
+$NetBSD: patch-demo_Makefile.in,v 1.1 2025/01/06 21:36:25 ktnb Exp $
+
+--- demo/Makefile.in.orig 2009-12-05 20:03:51.000000000 +0100
++++ demo/Makefile.in
+@@ -28,17 +28,17 @@ CONFIG_H = config.h
+
+ ALL_CFLAGS = $(CFLAGS) -Dunix -I$(SLANG_INCLUDE)
+
+-COMPILE_CMD = $(CC) -c $(ALL_CFLAGS)
++COMPILE_CMD = $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS)
+ EXECLIBS = -L$(SLANG_LIB) -lslang @M_LIB@ $(TCAPLIB)
+-EXECDEPS = $(SLANG_LIB)/libslang.a
++EXECDEPS = $(SLANG_LIB)/libslang.la
+ DOT_O_DEPS = demolib.c
+
+ #---------------------------------------------------------------------------
+ all: $(CONFIG_H) $(OTHERSTUFF)
+
+-$(CONFIG_H) : $(SLANG_LIB)/libslang.a ../src/config.h
+- /bin/cp ../src/config.h $(CONFIG_H)
+-$(SLANG_LIB)/libslang.a :
++$(CONFIG_H) : $(SLANG_LIB)/libslang.la ../src/config.h
++ cp ../src/config.h $(CONFIG_H)
++$(SLANG_LIB)/libslang.la :
+ cd ../src; $(MAKE)
+ #---------------------------------------------------------------------------
+ # Housekeeping
+@@ -49,21 +49,21 @@ distclean: clean
+ -/bin/rm -rf Makefile config.h
+ #
+ useropen : useropen.o $(useropen_DEPS) $(EXECDEPS)
+- $(CC) -o useropen $(LDFLAGS) useropen.o $(useropen_LIBS) $(EXECLIBS)
++ $(LIBTOOL) --mode=link $(CC) -o useropen $(LDFLAGS) useropen.lo $(useropen_LIBS) $(EXECLIBS)
+ useropen.o : useropen.c $(DOT_O_DEPS) $(useropen_O_DEP)
+ $(COMPILE_CMD) $(useropen_INC) $(EXECINC) useropen.c
+
+ pager : pager.o $(pager_DEPS) $(EXECDEPS)
+- $(CC) -o pager $(LDFLAGS) pager.o $(pager_LIBS) $(EXECLIBS)
++ $(LIBTOOL) --mode=link $(CC) -o pager $(LDFLAGS) pager.lo $(pager_LIBS) $(EXECLIBS)
+ pager.o : pager.c $(DOT_O_DEPS) $(pager_O_DEP)
+ $(COMPILE_CMD) $(pager_INC) $(EXECINC) pager.c
+
+ keypad : keypad.o $(keypad_DEPS) $(EXECDEPS)
+- $(CC) -o keypad $(LDFLAGS) keypad.o $(keypad_LIBS) $(EXECLIBS)
++ $(LIBTOOL) --mode=link $(CC) -o keypad $(LDFLAGS) keypad.lo $(keypad_LIBS) $(EXECLIBS)
+ keypad.o : keypad.c $(DOT_O_DEPS) $(keypad_O_DEP)
+ $(COMPILE_CMD) $(keypad_INC) $(EXECINC) keypad.c
+
+ smgtest : smgtest.o $(smgtest_DEPS) $(EXECDEPS)
+- $(CC) -o smgtest $(LDFLAGS) smgtest.o $(smgtest_LIBS) $(EXECLIBS)
++ $(LIBTOOL) --mode=link $(CC) -o smgtest $(LDFLAGS) smgtest.lo $(smgtest_LIBS) $(EXECLIBS)
+ smgtest.o : smgtest.c $(DOT_O_DEPS) $(smgtest_O_DEP)
+ $(COMPILE_CMD) $(smgtest_INC) $(EXECINC) smgtest.c
Index: pkgsrc/devel/libslang/patches/patch-modules_fork-module.c
diff -u /dev/null pkgsrc/devel/libslang/patches/patch-modules_fork-module.c:1.1
--- /dev/null Mon Jan 6 21:36:25 2025
+++ pkgsrc/devel/libslang/patches/patch-modules_fork-module.c Mon Jan 6 21:36:25 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-modules_fork-module.c,v 1.1 2025/01/06 21:36:25 ktnb Exp $
+
+--- modules/fork-module.c.orig 2009-12-05 19:03:51.000000000 +0000
++++ modules/fork-module.c
+@@ -275,7 +275,9 @@ static SLang_IConstant_Type Module_ICons
+ {
+ MAKE_ICONSTANT("WNOHANG", WNOHANG),
+ MAKE_ICONSTANT("WUNTRACED", WUNTRACED),
++#ifdef WCONTINUED
+ MAKE_ICONSTANT("WCONTINUED", WCONTINUED),
++#endif
+ SLANG_END_ICONST_TABLE
+ };
+
Index: pkgsrc/devel/libslang/patches/patch-src_slang.h
diff -u /dev/null pkgsrc/devel/libslang/patches/patch-src_slang.h:1.1
--- /dev/null Mon Jan 6 21:36:25 2025
+++ pkgsrc/devel/libslang/patches/patch-src_slang.h Mon Jan 6 21:36:25 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_slang.h,v 1.1 2025/01/06 21:36:25 ktnb Exp $
+
+--- src/slang.h.orig 2007-10-28 18:37:14.000000000 -0400
++++ src/slang.h
+@@ -43,6 +43,11 @@ USA.
+ # endif
+ #endif /* __watcomc__ */
+
++#if defined(__NetBSD__) || defined(__APPLE__)
++#undef unix
++#define unix 1
++#endif
++
+ #if defined(unix) || defined(__unix)
+ # ifndef __unix__
+ # define __unix__ 1
Index: pkgsrc/devel/libslang/patches/patch-src_slproc.c
diff -u /dev/null pkgsrc/devel/libslang/patches/patch-src_slproc.c:1.1
--- /dev/null Mon Jan 6 21:36:25 2025
+++ pkgsrc/devel/libslang/patches/patch-src_slproc.c Mon Jan 6 21:36:25 2025
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_slproc.c,v 1.1 2025/01/06 21:36:25 ktnb Exp $
+
+Set _XOPEN_SOURCE correctly on SunOS.
+
+--- src/slproc.c.orig 2022-08-05 10:33:27.000000000 +0000
++++ src/slproc.c
+@@ -28,12 +28,14 @@ USA.
+ # define _DEFAULT_SOURCE 1
+ #endif
+
++#if !defined(__sun) || (!defined(_XOPEN_SOURCE) && (__STDC_VERSION__-0 < 199901L))
+ #ifndef _XOPEN_SOURCE
+ # define _XOPEN_SOURCE 1
+ #endif
+ #ifndef _XOPEN_SOURCE_EXTENDED
+ # define _XOPEN_SOURCE_EXTENDED 1
+ #endif
++#endif
+
+ #ifndef __EXTENSIONS__
+ # define __EXTENSIONS__
Home |
Main Index |
Thread Index |
Old Index