cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to regina-rexx-3.9.3

Browse Source 
Note the major bump to libregina
This commit is contained in:
bcallah 2020-05-20 15:12:03 +00:00
parent c37aef6cb1
commit 4f02877b76
9 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lang/regina/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.2 2019/07/12 20:47:22 sthen Exp $
# $OpenBSD: Makefile,v 1.3 2020/05/20 15:12:03 bcallah Exp $
V = 3.9.1
V = 3.9.3
COMMENT = ANSI-compliant interpreter for REXX language (regina-rexx)
DISTNAME = Regina-REXX-${V}
DISTNAME = regina-rexx-${V}
PKGNAME = regina-${V}
CATEGORIES = lang
SHARED_LIBS += regina 0.0 # 0.0
SHARED_LIBS += regina 1.0 # 1.0
HOMEPAGE = https://regina-rexx.sourceforge.io/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
@ -14,7 +14,7 @@ MAINTAINER = Brian Callahan <bcallah@openbsd.org>
# GPLv2+
PERMIT_PACKAGE = Yes
WANTLIB += c pthread
WANTLIB += c curses m pthread
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=regina-rexx/}

4
lang/regina/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (Regina-REXX-3.9.1.tar.gz) = XRPfJph+J/Jed3mi76h6V3UhO+7aRJqe+sWbV6XV8+4=
SIZE (Regina-REXX-3.9.1.tar.gz) = 1358458
SHA256 (regina-rexx-3.9.3.tar.gz) = FxKqvuWXj99XrqyCzVoaESuJgNuMXX0EVSP2qLdLBTE=
SIZE (regina-rexx-3.9.3.tar.gz) = 2672320

7
lang/regina/patches/patch-Makefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2018/05/07 17:55:20 bcallah Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2020/05/20 15:12:03 bcallah Exp $
Do not gzip manual pages.
Properly install shlib.
@ -6,18 +6,19 @@ Properly install shlib.
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -1041,10 +1041,6 @@ installbase: all
@@ -1045,11 +1045,6 @@ installbase: all
$(INSTALL) -m 644 -c $(srcdir)/regina-config.1 $(DESTDIR)$(mandir)/man1/regina-config.1
$(INSTALL) -m 644 -c $(srcdir)/rxstack.1 $(DESTDIR)$(mandir)/man1/rxstack.1
$(INSTALL) -m 644 -c $(srcdir)/rxqueue.1 $(DESTDIR)$(mandir)/man1/rxqueue.1
- gzip -f $(DESTDIR)$(mandir)/man1/regina.1
- gzip -f $(DESTDIR)$(mandir)/man1/rexx.1
- gzip -f $(DESTDIR)$(mandir)/man1/regina-config.1
- gzip -f $(DESTDIR)$(mandir)/man1/rxstack.1
- gzip -f $(DESTDIR)$(mandir)/man1/rxqueue.1
$(INSTALL) -m 644 -c $(srcdir)/rexxsaa.h $(DESTDIR)$(includedir)/rexxsaa.h
$(INSTALL) -m 644 -c ./en.mtb $(DESTDIR)$(sharedir)/en.mtb
$(INSTALL) -m 644 -c ./pt.mtb $(DESTDIR)$(sharedir)/pt.mtb
@@ -1075,7 +1071,7 @@ installregina:
@@ -1084,7 +1079,7 @@ installregina:
-chmod 755 $(DESTDIR)$(examplesdir)/regutil.rexx
installlib: installregina

8
lang/regina/patches/patch-builtin_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-builtin_c,v 1.1.1.1 2018/05/07 17:55:20 bcallah Exp $
$OpenBSD: patch-builtin_c,v 1.2 2020/05/20 15:12:03 bcallah Exp $
time_t requires %lld
Index: builtin.c
--- builtin.c.orig
+++ builtin.c
@@ -1039,7 +1039,7 @@ streng *std_time( tsd_t *TSD, cparamboxptr parms )
@@ -1037,7 +1037,7 @@ streng *std_time( tsd_t *TSD, cparamboxptr parms )
break ;
case 'L':
@ -14,7 +14,7 @@ Index: builtin.c
break ;
case 'M':
@@ -1068,7 +1068,7 @@ streng *std_time( tsd_t *TSD, cparamboxptr parms )
@@ -1066,7 +1066,7 @@ streng *std_time( tsd_t *TSD, cparamboxptr parms )
case 'T':
rnow = mktime( &tmdata );
@ -23,7 +23,7 @@ Index: builtin.c
break ;
default:
@@ -1308,7 +1308,7 @@ streng *std_date( tsd_t *TSD, cparamboxptr parms )
@@ -1302,7 +1302,7 @@ streng *std_date( tsd_t *TSD, cparamboxptr parms )
case 'T':
tmdata.tm_year -= 1900;
rnow = mktime( &tmdata );

8
lang/regina/patches/patch-configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.1.1.1 2018/05/07 17:55:20 bcallah Exp $
$OpenBSD: patch-configure,v 1.2 2020/05/20 15:12:03 bcallah Exp $
Force versioned shlib.
Make sure 64-bit and 32-bit archs are properly discovered.
@ -6,7 +6,7 @@ Make sure 64-bit and 32-bit archs are properly discovered.
Index: configure
--- configure.orig
+++ configure
@@ -3492,9 +3492,11 @@ case "$target" in
@@ -3523,9 +3523,11 @@ case "$target" in
;;
*-freebsd* | *-openbsd*)
mach="`uname -m`"
@ -19,7 +19,7 @@ Index: configure
fi
;;
*nto-qnx*)
@@ -8686,13 +8688,13 @@ case "$target" in
@@ -8717,13 +8719,13 @@ case "$target" in
LD_RXLIB_UTILA="$ac_cv_prog_CC -shared ${LDFLAGS} -o \$(@)"
SHL_LD="$ac_cv_prog_CC -shared ${LDFLAGS} -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'
else
@ -33,7 +33,7 @@ Index: configure
LD_RXLIB_B2="-lc -L. -l${SHLFILE}"
LD_RXLIB_UTILB="-lc -L. -l${SHLFILE}"
- SHL_LD="ld -Bdynamic -Bshareable ${LDFLAGS} -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')'
+ SHL_LD="$ac_cv_prog_CC -shared ${LDFLAGS} -o ${SHLPRE}${SHLFILE}${SHLPST}.0.0 "'$('SHOFILES')'
+ SHL_LD="$ac_cv_prog_CC -shared ${LDFLAGS} -o ${SHLPRE}${SHLFILE}${SHLPST}.${LIBregina_VERSION} "'$('SHOFILES')'
fi
STATIC_LDFLAGS="-static"
SHLPRE="lib"

8
lang/regina/patches/patch-files_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-files_c,v 1.1.1.1 2018/05/07 17:55:20 bcallah Exp $
$OpenBSD: patch-files_c,v 1.2 2020/05/20 15:12:03 bcallah Exp $
time_t requires %lld
Index: files.c
--- files.c.orig
+++ files.c
@@ -4254,7 +4254,7 @@ static streng *getstatus( tsd_t *TSD, const streng *fi
@@ -4261,7 +4261,7 @@ static streng *getstatus( tsd_t *TSD, const streng *fi
if ( sizeof(off_t) > 4 )
sprintf( result->value, "%lld", buffer.st_ctime );
else
@ -14,7 +14,7 @@ Index: files.c
#endif
}
break;
@@ -4272,7 +4272,7 @@ static streng *getstatus( tsd_t *TSD, const streng *fi
@@ -4279,7 +4279,7 @@ static streng *getstatus( tsd_t *TSD, const streng *fi
if ( sizeof(off_t) > 4 )
sprintf( result->value, "%lld", buffer.st_mtime );
else
@ -23,7 +23,7 @@ Index: files.c
#endif
}
break;
@@ -4290,7 +4290,7 @@ static streng *getstatus( tsd_t *TSD, const streng *fi
@@ -4297,7 +4297,7 @@ static streng *getstatus( tsd_t *TSD, const streng *fi
if ( sizeof(off_t) > 4 )
sprintf( result->value, "%lld", buffer.st_atime );
else

4
lang/regina/patches/patch-regutil_regini_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-regutil_regini_c,v 1.1.1.1 2018/05/07 17:55:20 bcallah Exp $
$OpenBSD: patch-regutil_regini_c,v 1.2 2020/05/20 15:12:03 bcallah Exp $
time_t requires %lld
Index: regutil/regini.c
--- regutil/regini.c.orig
+++ regutil/regini.c
@@ -544,10 +544,10 @@ rxfunc(sysqueryprocess)
@@ -547,10 +547,10 @@ rxfunc(sysqueryprocess)
result->strlength = 6;
}
else if (!strcmp(arg, "PTIME")) {

14
lang/regina/patches/patch-rxstack_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-rxstack_c,v 1.1.1.1 2018/05/07 17:55:20 bcallah Exp $
$OpenBSD: patch-rxstack_c,v 1.2 2020/05/20 15:12:03 bcallah Exp $
Fix formatting.
Index: rxstack.c
--- rxstack.c.orig
+++ rxstack.c
@@ -1575,7 +1575,7 @@ int rxstack_pull_line_off_queue( Client *client, stren
@@ -1585,7 +1585,7 @@ int rxstack_pull_line_off_queue( Client *client, stren
if ( q->oldest == NULL )
q->oldest = client;
rc = RXSTACK_WAITING; /* waiting */
@ -14,7 +14,7 @@ Index: rxstack.c
}
}
}
@@ -1854,7 +1854,7 @@ int rxstack_process_websockets_headers( Client *client
@@ -1914,7 +1914,7 @@ int rxstack_process_websockets_headers( Client *client
key[end-start] = '\0';
start = strstr(ws_headers, "\r\n\r\n");
@ -23,7 +23,7 @@ Index: rxstack.c
/*
* Generate our response key
@@ -1906,11 +1906,11 @@ int decode_ws_payload( unsigned char *src, size_t srcl
@@ -1966,11 +1966,11 @@ int decode_ws_payload( unsigned char *src, size_t srcl
// Find beginning of next frame. First time hdr_length, masked and
// payload_length are zero
frame += hdr_length + 4*masked + payload_length;
@ -37,7 +37,7 @@ Index: rxstack.c
break;
}
remaining = (src + srclength) - frame;
@@ -1950,7 +1950,7 @@ int decode_ws_payload( unsigned char *src, size_t srcl
@@ -2010,7 +2010,7 @@ int decode_ws_payload( unsigned char *src, size_t srcl
{
continue;
}
@ -46,7 +46,7 @@ Index: rxstack.c
payload = frame + hdr_length + 4*masked;
if (*opcode != 1 && *opcode != 2)
@@ -2958,7 +2958,7 @@ int rxstack_doit( )
@@ -3041,7 +3041,7 @@ int rxstack_doit( )
rc = 0 ; /* already timed out */
if ( ( rc == -1 ) || ( rc > DEFAULT_WAKEUP ) )
rc = DEFAULT_WAKEUP ;
@ -55,7 +55,7 @@ Index: rxstack.c
#if defined(HAVE_POLL) && (defined(HAVE_POLL_H) || defined(HAVE_SYS_POLL_H))
rc = poll( pd, poll_cnt, rc ) ;
#else
@@ -2967,7 +2967,7 @@ int rxstack_doit( )
@@ -3050,7 +3050,7 @@ int rxstack_doit( )
rc = select( max_sock + 1, &ready, (fd_set *)0, (fd_set *)0, &to ) ;
#endif
now = get_now( ) ;

53
lang/regina/pkg/PLIST
View File

@ -1,37 +1,38 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/05/07 17:55:20 bcallah Exp $
@comment $OpenBSD: PLIST,v 1.2 2020/05/20 15:12:03 bcallah Exp $
@bin bin/regina
bin/regina-config
@bin bin/rexx
@bin bin/rxqueue
@bin bin/rxstack
include/rexxsaa.h
lib/libregina.a
@static-lib lib/libregina.a
@lib lib/libregina.so.${LIBregina_VERSION}
lib/pkgconfig/libregina.pc
lib/regina-rexx/
lib/regina-rexx/addons/
@so lib/regina-rexx/addons/libregutil.so
@so lib/regina-rexx/addons/librxtest1.so
@so lib/regina-rexx/addons/librxtest2.so
@man man/man1/regina-config.1
@man man/man1/regina.1
@man man/man1/rexx.1
@man man/man1/rxqueue.1
@man man/man1/rxstack.1
share/Regina-REXX/
share/Regina-REXX/addons/
share/Regina-REXX/addons/libregutil.so
share/Regina-REXX/addons/librxtest1.so
share/Regina-REXX/addons/librxtest2.so
share/Regina-REXX/de.mtb
share/Regina-REXX/en.mtb
share/Regina-REXX/es.mtb
share/Regina-REXX/examples/
share/Regina-REXX/examples/animal.rexx
share/Regina-REXX/examples/block.rexx
share/Regina-REXX/examples/dateconv.rexx
share/Regina-REXX/examples/dynfunc.rexx
share/Regina-REXX/examples/newstr.rexx
share/Regina-REXX/examples/regutil.rexx
share/Regina-REXX/examples/rexxcps.rexx
share/Regina-REXX/examples/timeconv.rexx
share/Regina-REXX/no.mtb
share/Regina-REXX/pl.mtb
share/Regina-REXX/pt.mtb
share/Regina-REXX/rxstack
@sample ${SYSCONFDIR}/rxstack
share/Regina-REXX/sv.mtb
share/Regina-REXX/tr.mtb
share/regina-rexx/
share/regina-rexx/de.mtb
share/regina-rexx/en.mtb
share/regina-rexx/es.mtb
share/regina-rexx/examples/
share/regina-rexx/examples/animal.rexx
share/regina-rexx/examples/block.rexx
share/regina-rexx/examples/dateconv.rexx
share/regina-rexx/examples/dynfunc.rexx
share/regina-rexx/examples/newstr.rexx
share/regina-rexx/examples/regutil.rexx
share/regina-rexx/examples/rexxcps.rexx
share/regina-rexx/examples/timeconv.rexx
share/regina-rexx/no.mtb
share/regina-rexx/pl.mtb
share/regina-rexx/pt.mtb
share/regina-rexx/sv.mtb
share/regina-rexx/tr.mtb