diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2024-03-06 14:48:41 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2024-12-29 11:34:56 +0000 |
| commit | 624b8729fc49aa22cca173aa1a6b69b65fa96f5a (patch) | |
| tree | 1358d8005ff1a9b45d468506fd52ee28a9bf39e3 /lang/gnu-cobol | |
| parent | 4d94dadbdacb76d55fefdf5c42c4a06712c1dd72 (diff) | |
Diffstat (limited to 'lang/gnu-cobol')
| -rw-r--r-- | lang/gnu-cobol/Makefile | 8 | ||||
| -rw-r--r-- | lang/gnu-cobol/files/patch-configure.ac | 34 |
2 files changed, 36 insertions, 6 deletions
diff --git a/lang/gnu-cobol/Makefile b/lang/gnu-cobol/Makefile index 6277b81e0fa8..a3ca109c6931 100644 --- a/lang/gnu-cobol/Makefile +++ b/lang/gnu-cobol/Makefile @@ -11,14 +11,14 @@ WWW= https://www.gnu.org/software/gnucobol/ LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi +BUILD_DEPENDS= help2man:misc/help2man LIB_DEPENDS= libgmp.so:math/gmp \ libcjson.so:devel/libcjson -USES= bdb gmake gnome libtool ncurses tar:xz +USES= autoreconf bdb gmake gnome libtool ncurses tar:xz USE_GNOME= libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ENV= MATH_LIBS=-lm TEST_TARGET= check @@ -37,8 +37,4 @@ OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE=nls -post-patch: - @${REINPLACE_CMD} -e 's|-lcurses|-lncurses|g ; \ - s|-R$$found_dir|-Wl,-rpath,$$found_dir|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/lang/gnu-cobol/files/patch-configure.ac b/lang/gnu-cobol/files/patch-configure.ac new file mode 100644 index 000000000000..b8c0b2d330fc --- /dev/null +++ b/lang/gnu-cobol/files/patch-configure.ac @@ -0,0 +1,34 @@ +--- configure.ac.orig 2023-07-28 17:16:37 UTC ++++ configure.ac +@@ -54,6 +54,8 @@ AC_CONFIG_FILES([tests/run_prog_manual.sh], + AC_CONFIG_FILES([tests/run_prog_manual.sh], + [chmod +x tests/run_prog_manual.sh]) + ++AC_PATH_PROGS([MAKE], [gmake gnumake make]) ++ + # In general: don't export/setenv but pass as option to configure + # this has the benefit that re-runs will take the same and "sudo" + # or later "make" (possibly as different user) will use the same +@@ -291,22 +293,6 @@ AC_DEFINE_UNQUOTED([MAX_CALL_FIELD_PARAMS], [$with_max + + + # Basic capability tests +- +-configured_make="" +-if test -z "$MAKE"; then +- AC_CHECK_PROGS([configured_make], [make gmake gnumake]) +- if test -z "$configured_make"; then +- AC_MSG_ERROR([make not found]) +- else +- MAKE=$configured_make +- AC_SUBST(MAKE) +- fi +-else +- AC_CHECK_PROG([configured_make], [$MAKE], [$MAKE]) +- if test -z "$configured_make"; then +- AC_MSG_ERROR([make, configured as "$MAKE", was not found]) +- fi +-fi + + AC_MSG_CHECKING([whether ${MAKE} can handle common constructs]) + rm -f confmake.out |