svn commit: r480231 - in head/shells: . ksh93-devel ksh93-devel/files
Cy Schubert
cy at FreeBSD.org
Fri Sep 21 07:20:45 UTC 2018
Author: cy
Date: Fri Sep 21 07:20:43 2018
New Revision: 480231
URL: https://svnweb.freebsd.org/changeset/ports/480231
Log:
Introducing the new ksh93-devel port, tracking att/ast development
on github.
Added:
head/shells/ksh93-devel/
- copied from r480221, head/shells/ksh93/
head/shells/ksh93-devel/files/patch-src_cmd_ksh93_meson.build (contents, props changed)
Deleted:
head/shells/ksh93-devel/files/patch-src-lib-libast-features-wchar
head/shells/ksh93-devel/files/patch-src-lib-libast-hash-hashalloc.c
head/shells/ksh93-devel/files/patch-src-lib-libast-string-tokscan.c
head/shells/ksh93-devel/files/patch-src_cmd_INIT_iffe.sh
Modified:
head/shells/Makefile
head/shells/ksh93-devel/Makefile
head/shells/ksh93-devel/distinfo
head/shells/ksh93-devel/pkg-plist
Modified: head/shells/Makefile
==============================================================================
--- head/shells/Makefile Fri Sep 21 07:11:11 2018 (r480230)
+++ head/shells/Makefile Fri Sep 21 07:20:43 2018 (r480231)
@@ -23,6 +23,7 @@
SUBDIR += jailkit
SUBDIR += klish
SUBDIR += ksh93
+ SUBDIR += ksh93-devel
SUBDIR += lshell
SUBDIR += mksh
SUBDIR += nologinmsg
Modified: head/shells/ksh93-devel/Makefile
==============================================================================
--- head/shells/ksh93/Makefile Fri Sep 21 00:54:45 2018 (r480221)
+++ head/shells/ksh93-devel/Makefile Fri Sep 21 07:20:43 2018 (r480231)
@@ -11,29 +11,32 @@
# complain to me about it.
PORTNAME= ksh93
-PORTVERSION= ${KSHVERSION:S/-//g}
-PORTREVISION= 2
+PORTVERSION= ${AST_COMMIT_DATE}
CATEGORIES= shells
-MASTER_SITES= http://www2.research.att.com/~astopen/download/tgz/ \
- LOCAL/sunpoet/${PORTNAME}
-DISTFILES= INIT.${INITVERSION}.tgz ast-ksh.${KSHVERSION}.tgz
-DIST_SUBDIR= ${PORTNAME}
+PKGNAMESUFFIX= -devel
+HASH= 4b26777
+AST_COMMIT_DATE= 2018.09.20
-MAINTAINER= saper at saper.info
-COMMENT= Official AT&T release of KornShell 93
+MAINTAINER= cy at FreeBSD.org
+COMMENT= Development branch of AT&T KornShell 93
LICENSE= EPL
OPTIONS_DEFINE= EXAMPLES STATIC
+USE_GITHUB= yes
+GH_ACCOUNT= att
+GH_PROJECT= ast
+GH_TAGNAME= ${HASH}
+
+CONFLICTS= ksh93-*
+
+USES= meson ninja
FETCH_ENV= HTTP_AUTH=basic:*:I\ accept\ www.opensource.org/licenses/cpl:.
-LDFLAGS+= -lm
+LDFLAGS+= -lm
+MESON_BUILD_DIR= build
MAKE_ENV= CCFLAGS="${CFLAGS}"
-NO_WRKSUBDIR= yes
-INITVERSION= 2013-05-24
-KSHVERSION= 2012-08-01
-
STATIC_MAKE_ENV= LDFLAGS+=-static
BROKEN_aarch64= Fails to compile: needs sbrk
@@ -44,15 +47,7 @@ post-patch:
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100093
@${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' ${WRKSRC}/src/lib/libast/include/sfio*.h ${WRKSRC}/src/lib/libast/sfio/*.c
.endif
-
-do-build:
- @cd ${WRKSRC}/ && ${SETENV} -i ${MAKE_ENV} ${SH} bin/package flat make
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/ksh ${STAGEDIR}${PREFIX}/bin/ksh93
- ${INSTALL_MAN} ${WRKSRC}/man/man1/sh.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ksh93.1
- ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
- cd ${WRKSRC}/fun/ && ${INSTALL_SCRIPT} dirs popd pushd ${STAGEDIR}${EXAMPLESDIR}/
+ @${MV} ${WRKSRC}/src/cmd/ksh93/ksh.1 ${WRKSRC}/src/cmd/ksh93/ksh93.1
do-test:
cd ${WRKSRC}/src/cmd/ksh93/tests/ && ${SETENV} SHELL=${WRKSRC}/bin/ksh ${WRKSRC}/bin/ksh shtests
Modified: head/shells/ksh93-devel/distinfo
==============================================================================
--- head/shells/ksh93/distinfo Fri Sep 21 00:54:45 2018 (r480221)
+++ head/shells/ksh93-devel/distinfo Fri Sep 21 07:20:43 2018 (r480231)
@@ -1,4 +1,3 @@
-SHA256 (ksh93/INIT.2013-05-24.tgz) = 118b2c8a4d651727fcd680289be69941d3045951bf9e3a4d45dcb42f0658f014
-SIZE (ksh93/INIT.2013-05-24.tgz) = 383979
-SHA256 (ksh93/ast-ksh.2012-08-01.tgz) = e6192cfa52a6a9fd20618cbaf3fa81f0cc9fd83525500757e83017275e962851
-SIZE (ksh93/ast-ksh.2012-08-01.tgz) = 2053532
+TIMESTAMP = 1537512222
+SHA256 (att-ast-2018.09.20-4b26777_GH0.tar.gz) = ec8711a8a19beae33de7be9911c29575584d38197940c834652df9ce66ac7d58
+SIZE (att-ast-2018.09.20-4b26777_GH0.tar.gz) = 15286573
Added: head/shells/ksh93-devel/files/patch-src_cmd_ksh93_meson.build
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/shells/ksh93-devel/files/patch-src_cmd_ksh93_meson.build Fri Sep 21 07:20:43 2018 (r480231)
@@ -0,0 +1,25 @@
+--- src/cmd/ksh93/meson.build.orig 2018-09-20 20:55:29.000000000 -0700
++++ src/cmd/ksh93/meson.build 2018-09-21 00:13:21.315431000 -0700
+@@ -27,19 +27,19 @@
+ dependencies: [libm_dep, libexecinfo_dep, libdl_dep],
+ install: false)
+
+-ksh93_exe = executable('ksh', ['sh/pmain.c'], c_args: shared_c_args,
++ksh93_exe = executable('ksh93', ['sh/pmain.c'], c_args: shared_c_args,
+ include_directories: [configuration_incdir, ksh93_incdir],
+ link_with: [libksh, libast, libcmd, libcoshell, libdll],
+ dependencies: [libm_dep, libexecinfo_dep, libdl_dep],
+ install: true)
+
+-shcomp_exe = executable('shcomp', ['sh/shcomp.c'], c_args: shared_c_args,
++shcomp_exe = executable('shcomp93', ['sh/shcomp.c'], c_args: shared_c_args,
+ include_directories: [configuration_incdir, ksh93_incdir],
+ link_with: [libksh, libast, libcmd, libcoshell, libdll],
+ dependencies: [libm_dep, libexecinfo_dep, libdl_dep],
+ install: true)
+
+-install_man('ksh.1')
++install_man('ksh93.1')
+
+ test_dir = join_paths(meson.current_source_dir(), 'tests')
+ test_driver = join_paths(test_dir, 'util', 'run_test.sh')
Modified: head/shells/ksh93-devel/pkg-plist
==============================================================================
--- head/shells/ksh93/pkg-plist Fri Sep 21 00:54:45 2018 (r480221)
+++ head/shells/ksh93-devel/pkg-plist Fri Sep 21 07:20:43 2018 (r480231)
@@ -1,5 +1,3 @@
@shell bin/ksh93
+bin/shcomp93
man/man1/ksh93.1.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dirs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/popd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pushd
More information about the svn-ports-all
mailing list