Revised patch:
i) Bump SHARED_LIB
ii) included patch-configure which missed in previous patch.
wen
________________________________
发件人: [email protected] <[email protected]> 代表 [email protected]
<[email protected]>
发送时间: 2020年11月30日 17:13
收件人: wen heping <[email protected]>
抄送: [email protected] <[email protected]>
主题: Re: [Update] lang/gnucobol : Update to 3.1
On Fri, Nov 13, 2020 at 02:20:32AM +0000, wen heping wrote:
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/gnucobol/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 12 Jul 2019 20:47:18 -0000 1.4
> +++ Makefile 13 Nov 2020 02:11:38 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT= COBOL compiler, formerly known as OpenCOBOL
>
> -DISTNAME = gnucobol-2.2
> -REVISION = 1
> +DISTNAME = gnucobol-3.1
>
> SHARED_LIBS += cob 4.0 # 4.0
At least the library minor number must be bumped.
Please read the "Shared Libraries" part of the "Special Porting Topics"
section in the Porter's Handbook for more information:
https://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/gnucobol/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 12 Jul 2019 20:47:18 -0000 1.4
+++ Makefile 8 Dec 2020 02:49:01 -0000
@@ -2,10 +2,9 @@
COMMENT= COBOL compiler, formerly known as OpenCOBOL
-DISTNAME = gnucobol-2.2
-REVISION = 1
+DISTNAME = gnucobol-3.1
-SHARED_LIBS += cob 4.0 # 4.0
+SHARED_LIBS += cob 4.1 # 4.1
CATEGORIES = lang
@@ -21,6 +20,7 @@ WANTLIB += c curses db gmp iconv intl m
MASTER_SITES = ${MASTER_SITE_GNU:=gnucobol/}
+BUILD_DEPENDS = print/texinfo
LIB_DEPENDS = databases/db/v4 \
devel/gettext,-runtime \
devel/gmp
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/gnucobol/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 25 Apr 2018 07:39:01 -0000 1.1.1.1
+++ distinfo 8 Dec 2020 02:49:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (gnucobol-2.2.tar.gz) = klg43s1lhksqo6S/E4XOS8cIuULgXoQGlFpzDXqrMss=
-SIZE (gnucobol-2.2.tar.gz) = 2660284
+SHA256 (gnucobol-3.1.tar.gz) = xI1Clx/KmiBRj62OtDghjSocsxsuKJXfS5bc9ivoQ0g=
+SIZE (gnucobol-3.1.tar.gz) = 3844877
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 8 Dec 2020 02:49:01 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -3112,7 +3112,7 @@ AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__a
+ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
++MAKEINFO=${MAKEINFO-"${am_missing_run}gmakeinfo"}
+
+ # For better backward compatibility. To be removed once Automake 1.9.x
+ # dies out for good. For more background, see:
Index: patches/patch-libcob_Makefile_in
===================================================================
RCS file: patches/patch-libcob_Makefile_in
diff -N patches/patch-libcob_Makefile_in
--- patches/patch-libcob_Makefile_in 25 Apr 2018 07:39:01 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-libcob_Makefile_in,v 1.1.1.1 2018/04/25 07:39:01 fcambus Exp $
-
-Index: libcob/Makefile.in
---- libcob/Makefile.in.orig
-+++ libcob/Makefile.in
-@@ -774,7 +774,7 @@ info-am:
-
- install-data-am: install-pkgincludeHEADERS
- @$(NORMAL_INSTALL)
-- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
-+ $(MAKE) $(AM_MAKEFLAGS)
- install-dvi: install-dvi-am
-
- install-dvi-am:
Index: patches/patch-libcob_common_c
===================================================================
RCS file: /cvs/ports/lang/gnucobol/patches/patch-libcob_common_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-libcob_common_c
--- patches/patch-libcob_common_c 25 Apr 2018 07:39:01 -0000 1.1.1.1
+++ patches/patch-libcob_common_c 8 Dec 2020 02:49:01 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-libcob_common_c,v 1.1.1.
Index: libcob/common.c
--- libcob/common.c.orig
+++ libcob/common.c
-@@ -310,7 +310,7 @@ static struct config_tbl gc_conf[] = {
+@@ -407,7 +407,7 @@ static struct config_tbl gc_conf[] = {
{"LOGNAME", "logname", NULL, NULL, GRP_HIDE,
ENV_STR, SETPOS (cob_user_name)},
#if !defined (_WIN32) || defined (__MINGW32__) /* cygwin does not define
_WIN32 */
{"LANG", "lang", NULL, NULL,
GRP_SYSENV, ENV_STR, SETPOS (cob_sys_lang)},
Index: patches/patch-libcob_fileio_c
===================================================================
RCS file: patches/patch-libcob_fileio_c
diff -N patches/patch-libcob_fileio_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libcob_fileio_c 8 Dec 2020 02:49:01 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libcob/fileio.c
+--- libcob/fileio.c.orig
++++ libcob/fileio.c
+@@ -42,7 +42,7 @@
+ #include <time.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <sys/timeb.h>
++#include <sys/time.h>
+
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/gnucobol/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 25 Apr 2018 07:39:01 -0000 1.1.1.1
+++ pkg/PLIST 8 Dec 2020 02:49:01 -0000
@@ -8,13 +8,15 @@ include/libcob/
include/libcob.h
include/libcob/cobgetopt.h
include/libcob/common.h
+include/libcob/exception-io.def
include/libcob/exception.def
@info info/gnucobol.info
lib/gnucobol/
-lib/gnucobol/CBL_OC_DUMP.so
-lib/libcob.a
+@so lib/gnucobol/CBL_OC_DUMP.so
+@static-lib lib/libcob.a
lib/libcob.la
@lib lib/libcob.so.${LIBcob_VERSION}
+@man man/man1/cob-config.1
@man man/man1/cobc.1
@man man/man1/cobcrun.1
share/gnucobol/
@@ -42,6 +44,9 @@ share/gnucobol/config/mf.words
share/gnucobol/config/mvs-strict.conf
share/gnucobol/config/mvs.conf
share/gnucobol/config/mvs.words
+share/gnucobol/config/realia-strict.conf
+share/gnucobol/config/realia.conf
+share/gnucobol/config/realia.words
share/gnucobol/config/rm-strict.conf
share/gnucobol/config/rm.conf
share/gnucobol/config/rm.words
@@ -52,11 +57,16 @@ share/gnucobol/copy/
share/gnucobol/copy/screenio.cpy
share/gnucobol/copy/sqlca.cpy
share/gnucobol/copy/sqlda.cpy
+share/gnucobol/copy/xfhfcd.cpy
+share/gnucobol/copy/xfhfcd3.cpy
share/locale/de/LC_MESSAGES/gnucobol.mo
share/locale/en@boldquot/LC_MESSAGES/gnucobol.mo
share/locale/en@quot/LC_MESSAGES/gnucobol.mo
share/locale/es/LC_MESSAGES/gnucobol.mo
+share/locale/fr/LC_MESSAGES/gnucobol.mo
share/locale/it/LC_MESSAGES/gnucobol.mo
share/locale/ja/LC_MESSAGES/gnucobol.mo
share/locale/nl/LC_MESSAGES/gnucobol.mo
share/locale/pt/LC_MESSAGES/gnucobol.mo
+share/locale/sr/LC_MESSAGES/gnucobol.mo
+share/locale/sv/LC_MESSAGES/gnucobol.mo
