[pkgsrc/trunk]: pkgsrc/lang/opencobol * Move info file entrise to PLIST.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/opencobol * Move info file entrise to PLIST.
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:18:06 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/918a6af2aafc
branches:  trunk
changeset: 510825:918a6af2aafc
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Apr 04 19:21:39 2006 +0000

description:
* Move info file entrise to PLIST.

* Remove patch-ac which patched the Makefile to install the example config
  file into the examples directory and replace with an appropriate
  INSTALL_MAKE_FLAGS setting.

* Remove SUBST_FILES setting and replace with a patch.  This will make
  merges with future updates easier.

* Fix the location of the example configuration file to match where it's
  actually installed.  Now, the file will actually be copied over during
  POST-INSTALL.

diffstat:

 lang/opencobol/Makefile         |  23 +++++--------------
 lang/opencobol/PLIST            |   3 +-
 lang/opencobol/distinfo         |   4 +-
 lang/opencobol/patches/patch-ac |  38 -------------------------------
 lang/opencobol/patches/patch-ad |  49 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 59 insertions(+), 58 deletions(-)

diffs (167 lines):

diff -r 15520cb4ec00 -r 918a6af2aafc lang/opencobol/Makefile
--- a/lang/opencobol/Makefile   Tue Apr 04 19:12:10 2006 +0000
+++ b/lang/opencobol/Makefile   Tue Apr 04 19:21:39 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:29:55 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/04 19:21:39 jlam Exp $
 #
 
 DISTNAME=              open-cobol-0.23
@@ -16,26 +16,15 @@
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
-
-INFO_FILES=            open-cobol.info
+INFO_FILES=            # PLIST
+INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
 
 CONFIGURE_ARGS+=       --without-readline
 CONFIGURE_ARGS+=       --with-lfs
-
-EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES=            ${EGDIR}/libconf.conf ${PKG_SYSCONFDIR}/libconf.conf
-
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ENV+=                NCURSES_LIB=${BUILDLINK_LDADD.ncurses:Q}
 
-SUBST_CLASSES+=                lnk
-SUBST_STAGE.lnk=       post-patch
-SUBST_FILES.lnk=       configure
-SUBST_SED.lnk=         -e "s|COBC_LIBS=\"\"|COBC_LIBS=\"\$$LDFLAGS\"|g" \
-                       -e "s|LIBCOB_LIBS=\"-lm\"|LIBCOB_LIBS=\"-lm \$$LDFLAGS\"|g"
-.if ${OPSYS} == "NetBSD"
-SUBST_SED.lnk+=                -e "s,-lncurses,-lcurses,g"
-.endif
-SUBST_MESSAGE.lnk=     "Fixing linking flags."
+EGDIR=                 ${PREFIX}/share/examples/open-cobol
+CONF_FILES=            ${EGDIR}/libconf.conf ${PKG_SYSCONFDIR}/libconf.conf
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
diff -r 15520cb4ec00 -r 918a6af2aafc lang/opencobol/PLIST
--- a/lang/opencobol/PLIST      Tue Apr 04 19:12:10 2006 +0000
+++ b/lang/opencobol/PLIST      Tue Apr 04 19:21:39 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:40 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/04/04 19:21:39 jlam Exp $
 bin/cob-config
 bin/cobc
 include/libcob.h
@@ -11,6 +11,7 @@
 include/libcob/screenio.h
 include/libcob/strings.h
 include/libcob/termio.h
+info/open-cobol.info
 lib/libcob.la
 share/examples/open-cobol/libcob.conf
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/open-cobol.mo
diff -r 15520cb4ec00 -r 918a6af2aafc lang/opencobol/distinfo
--- a/lang/opencobol/distinfo   Tue Apr 04 19:12:10 2006 +0000
+++ b/lang/opencobol/distinfo   Tue Apr 04 19:21:39 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:03:10 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/04/04 19:21:39 jlam Exp $
 
 SHA1 (open-cobol-0.23.tar.gz) = 52ce50e80ba62148fbbf622232745f528f33c61d
 RMD160 (open-cobol-0.23.tar.gz) = 72a439ac7ee0caab3b48aa84d4bf109415192160
 Size (open-cobol-0.23.tar.gz) = 658911 bytes
 SHA1 (patch-aa) = 801c5c3ff8ff4dd437322bd1065d8b8c4b72ff31
 SHA1 (patch-ab) = 845d386051dd3f73dca44e5de2e4eb53e280090c
-SHA1 (patch-ac) = 26dc26a4610fe714ef0d46a3a348ef83ea29b705
+SHA1 (patch-ad) = 69becd5db1b0b54b713c940467e5d4d1b73a8df4
diff -r 15520cb4ec00 -r 918a6af2aafc lang/opencobol/patches/patch-ac
--- a/lang/opencobol/patches/patch-ac   Tue Apr 04 19:12:10 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/06/29 02:57:37 xtraeme Exp $
-
---- Makefile.in.orig   2004-06-29 04:52:23.000000000 +0200
-+++ Makefile.in        2004-06-29 04:54:22.000000000 +0200
-@@ -135,6 +135,7 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+examplesdir = @datadir@/examples/@PACKAGE@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
-@@ -263,20 +264,20 @@
- sysconfDATA_INSTALL = $(INSTALL_DATA)
- install-sysconfDATA: $(sysconf_DATA)
-       @$(NORMAL_INSTALL)
--      $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-+      $(mkinstalldirs) $(DESTDIR)$(examplesdir)
-       @list='$(sysconf_DATA)'; for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
--        echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
--        $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
-+        echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(examplesdir)/$$f"; \
-+        $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(examplesdir)/$$f; \
-       done
- 
- uninstall-sysconfDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(sysconf_DATA)'; for p in $$list; do \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
--        echo " rm -f $(DESTDIR)$(sysconfdir)/$$f"; \
--        rm -f $(DESTDIR)$(sysconfdir)/$$f; \
-+        echo " rm -f $(DESTDIR)$(examplesdir)/$$f"; \
-+        rm -f $(DESTDIR)$(examplesdir)/$$f; \
-       done
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
- install-includeHEADERS: $(include_HEADERS)
diff -r 15520cb4ec00 -r 918a6af2aafc lang/opencobol/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/opencobol/patches/patch-ad   Tue Apr 04 19:21:39 2006 +0000
@@ -0,0 +1,49 @@
+$NetBSD: patch-ad,v 1.1 2006/04/04 19:21:39 jlam Exp $
+
+--- configure.orig     2003-06-11 16:13:55.000000000 -0400
++++ configure
+@@ -1932,9 +1932,9 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
+ 
+ 
+-COBC_LIBS=""
++COBC_LIBS="$LDFLAGS"
+ COBC_CFLAGS=""
+-LIBCOB_LIBS="-lm"
++LIBCOB_LIBS="$LDFLAGS -lm"
+ LIBCOB_CFLAGS=""
+ 
+ # Configure options.
+@@ -22701,13 +22701,13 @@ fi
+ done
+ 
+ 
+-echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
+-echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for initscr in $NCURSES_LIB" >&5
++echo $ECHO_N "checking for initscr in $NCURSES_LIB... $ECHO_C" >&6
+ if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lncurses  $LIBS"
++LIBS="$NCURSES_LIB  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -22760,13 +22760,13 @@ if test $ac_cv_lib_ncurses_initscr = yes
+ #define HAVE_LIBNCURSES 1
+ _ACEOF
+ 
+-  LIBS="-lncurses $LIBS"
++  LIBS="$NCURSES_LIB $LIBS"
+ 
+ fi
+ 
+ if test "x$ac_cv_lib_ncurses_initscr" = "xyes"; then
+   USE_NCURSES="yes"
+-  LIBCOB_LIBS="$LIBCOB_LIBS -lncurses"
++  LIBCOB_LIBS="$LIBCOB_LIBS $NCURSES_LIB"
+ fi
+ 
+ # Checks for readline.

Prev by Date: [pkgsrc/trunk]: pkgsrc/mk/plist Create a new variable IGNORE_LIBTOOLIZE conta...
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/twelf * List info files directly in the PLIST and...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mk/plist Create a new variable IGNORE_LIBTOOLIZE conta...
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/twelf * List info files directly in the PLIST and...
Indexes:

Home | Main Index | Thread Index | Old Index