pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/www



Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Apr 14 21:35:06 UTC 2023

Modified Files:
        pkgsrc/www: Makefile
Added Files:
        pkgsrc/www/elinks: DESCR Makefile PLIST distinfo options.mk
        pkgsrc/www/elinks/patches: patch-src_util_memory.c
Removed Files:
        pkgsrc/www/felinks: DESCR Makefile PLIST distinfo options.mk
        pkgsrc/www/felinks/patches: patch-src_util_memory.c

Log Message:
Rename "felinks" to "elinks" now that there is no "elinks" package.


To generate a diff of this commit:
cvs rdiff -u -r1.1701 -r1.1702 pkgsrc/www/Makefile
cvs rdiff -u -r0 -r1.4 pkgsrc/www/elinks/DESCR
cvs rdiff -u -r0 -r1.76 pkgsrc/www/elinks/Makefile
cvs rdiff -u -r0 -r1.13 pkgsrc/www/elinks/PLIST
cvs rdiff -u -r0 -r1.34 pkgsrc/www/elinks/distinfo
cvs rdiff -u -r0 -r1.19 pkgsrc/www/elinks/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/www/elinks/patches/patch-src_util_memory.c
cvs rdiff -u -r1.1 -r0 pkgsrc/www/felinks/DESCR pkgsrc/www/felinks/PLIST \
    pkgsrc/www/felinks/options.mk
cvs rdiff -u -r1.10 -r0 pkgsrc/www/felinks/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/www/felinks/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/www/felinks/patches/patch-src_util_memory.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/Makefile
diff -u pkgsrc/www/Makefile:1.1701 pkgsrc/www/Makefile:1.1702
--- pkgsrc/www/Makefile:1.1701  Thu Apr 13 13:55:55 2023
+++ pkgsrc/www/Makefile Fri Apr 14 21:35:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1701 2023/04/13 13:55:55 wiz Exp $
+# $NetBSD: Makefile,v 1.1702 2023/04/14 21:35:06 nia Exp $
 #
 
 COMMENT=       Packages related to the World Wide Web
@@ -105,13 +105,13 @@ SUBDIR+=  drraw
 SUBDIR+=       drupal7
 SUBDIR+=       drupal9
 SUBDIR+=       e2guardian
+SUBDIR+=       elinks
 SUBDIR+=       eliom
 SUBDIR+=       emacs-w3m
 SUBDIR+=       emacs-w3m-snapshot
 SUBDIR+=       epiphany
 SUBDIR+=       fcgi
 SUBDIR+=       fcgiwrap
-SUBDIR+=       felinks
 SUBDIR+=       fengoffice
 SUBDIR+=       ffproxy
 SUBDIR+=       firefox

Added files:

Index: pkgsrc/www/elinks/DESCR
diff -u /dev/null pkgsrc/www/elinks/DESCR:1.4
--- /dev/null   Fri Apr 14 21:35:06 2023
+++ pkgsrc/www/elinks/DESCR     Fri Apr 14 21:35:06 2023
@@ -0,0 +1,6 @@
+ELinks is an advanced and well-established feature-rich text mode web
+(HTTP/FTP/..) browser. ELinks can render both frames and tables, is highly
+customizable and can be extended via scripts. It is very portable and runs
+on a variety of platforms.
+
+This package was previously known as felinks, a fork of elinks.

Index: pkgsrc/www/elinks/Makefile
diff -u /dev/null pkgsrc/www/elinks/Makefile:1.76
--- /dev/null   Fri Apr 14 21:35:06 2023
+++ pkgsrc/www/elinks/Makefile  Fri Apr 14 21:35:06 2023
@@ -0,0 +1,49 @@
+# $NetBSD: Makefile,v 1.76 2023/04/14 21:35:06 nia Exp $
+
+DISTNAME=      elinks-0.15.1
+CATEGORIES=    www
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=rkd77/}
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
+DIST_SUBDIR=   felinks
+EXTRACT_SUFX=  .tar.xz
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/rkd77/elinks
+COMMENT=       Feature-rich text mode web browser
+LICENSE=       gnu-gpl-v2
+
+CONFLICTS+=    felinks-[0-9]*
+SUPERSEDES+=   felinks-[0-9]*
+
+USE_PKGLOCALEDIR=      yes
+GNU_CONFIGURE=         yes
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            gmake pkg-config
+USE_TOOLS+=            msgfmt xgettext
+
+# ld: no input files
+MAKE_JOBS_SAFE=        no
+
+post-install:
+       ${RM} -f ${DESTDIR}${PREFIX}/lib/charset.alias
+
+CONFIGURE_ARGS+=       --datadir=${PREFIX}/share/${PKGBASE}
+CONFIGURE_ARGS+=       --enable-256-colors
+CONFIGURE_ARGS+=       --enable-utf-8
+CONFIGURE_ARGS+=       --without-bzlib
+CONFIGURE_ARGS+=       --without-lzma
+CONFIGURE_ARGS+=       --without-lua
+
+.include "../../mk/bsd.prefs.mk"
+
+# for backtrace
+.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
+LIBS+= -lexecinfo
+.endif
+
+.include "options.mk"
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/elinks/PLIST
diff -u /dev/null pkgsrc/www/elinks/PLIST:1.13
--- /dev/null   Fri Apr 14 21:35:06 2023
+++ pkgsrc/www/elinks/PLIST     Fri Apr 14 21:35:06 2023
@@ -0,0 +1,39 @@
+@comment $NetBSD: PLIST,v 1.13 2023/04/14 21:35:06 nia Exp $
+bin/elinks
+man/man1/elinks.1
+man/man5/elinks.conf.5
+man/man5/elinkskeys.5
+share/elinks/locale/af/LC_MESSAGES/elinks.mo
+share/elinks/locale/be/LC_MESSAGES/elinks.mo
+share/elinks/locale/bg/LC_MESSAGES/elinks.mo
+share/elinks/locale/ca/LC_MESSAGES/elinks.mo
+share/elinks/locale/cs/LC_MESSAGES/elinks.mo
+share/elinks/locale/da/LC_MESSAGES/elinks.mo
+share/elinks/locale/de/LC_MESSAGES/elinks.mo
+share/elinks/locale/el/LC_MESSAGES/elinks.mo
+share/elinks/locale/es/LC_MESSAGES/elinks.mo
+share/elinks/locale/et/LC_MESSAGES/elinks.mo
+share/elinks/locale/fi/LC_MESSAGES/elinks.mo
+share/elinks/locale/fr/LC_MESSAGES/elinks.mo
+share/elinks/locale/gl/LC_MESSAGES/elinks.mo
+share/elinks/locale/hr/LC_MESSAGES/elinks.mo
+share/elinks/locale/hu/LC_MESSAGES/elinks.mo
+share/elinks/locale/id/LC_MESSAGES/elinks.mo
+share/elinks/locale/is/LC_MESSAGES/elinks.mo
+share/elinks/locale/it/LC_MESSAGES/elinks.mo
+share/elinks/locale/ja/LC_MESSAGES/elinks.mo
+share/elinks/locale/locale.alias
+share/elinks/locale/lt/LC_MESSAGES/elinks.mo
+share/elinks/locale/nb/LC_MESSAGES/elinks.mo
+share/elinks/locale/nl/LC_MESSAGES/elinks.mo
+share/elinks/locale/pl/LC_MESSAGES/elinks.mo
+share/elinks/locale/pt/LC_MESSAGES/elinks.mo
+share/elinks/locale/pt_BR/LC_MESSAGES/elinks.mo
+share/elinks/locale/ro/LC_MESSAGES/elinks.mo
+share/elinks/locale/ru/LC_MESSAGES/elinks.mo
+share/elinks/locale/sk/LC_MESSAGES/elinks.mo
+share/elinks/locale/sr/LC_MESSAGES/elinks.mo
+share/elinks/locale/sv/LC_MESSAGES/elinks.mo
+share/elinks/locale/tr/LC_MESSAGES/elinks.mo
+share/elinks/locale/uk/LC_MESSAGES/elinks.mo
+@pkgdir lib

Index: pkgsrc/www/elinks/distinfo
diff -u /dev/null pkgsrc/www/elinks/distinfo:1.34
--- /dev/null   Fri Apr 14 21:35:06 2023
+++ pkgsrc/www/elinks/distinfo  Fri Apr 14 21:35:06 2023
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.34 2023/04/14 21:35:06 nia Exp $
+
+BLAKE2s (felinks/elinks-0.15.1.tar.xz) = 7a4362b39107b155aa342156b92afbad4c1fb731ecb3db67a62e39d8c3fef08a
+SHA512 (felinks/elinks-0.15.1.tar.xz) = 677eeeeab3fc24dcfe4e7248a9c1a8e07083ebd13bd9923d89702a04dbe1c3e4d4038029c095881183d7f11ae2c5317ff7e5458320644fde0c176378b89068d8
+Size (felinks/elinks-0.15.1.tar.xz) = 1997208 bytes
+SHA1 (patch-src_util_memory.c) = dc390442f65d7cee70d28d6a6cba5ee0981eb83a

Index: pkgsrc/www/elinks/options.mk
diff -u /dev/null pkgsrc/www/elinks/options.mk:1.19
--- /dev/null   Fri Apr 14 21:35:06 2023
+++ pkgsrc/www/elinks/options.mk        Fri Apr 14 21:35:06 2023
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.19 2023/04/14 21:35:06 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.felinks
+PKG_OPTIONS_REQUIRED_GROUPS=   tls
+PKG_OPTIONS_GROUP.tls=         gnutls openssl
+PKG_SUGGESTED_OPTIONS=         gnutls
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnutls)
+.  include "../../security/gnutls/buildlink3.mk"
+.  include "../../security/libgcrypt/buildlink3.mk"
+CONFIGURE_ARGS+=       --without-openssl
+.endif
+
+.if !empty(PKG_OPTIONS:Mopenssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
+.endif

Index: pkgsrc/www/elinks/patches/patch-src_util_memory.c
diff -u /dev/null pkgsrc/www/elinks/patches/patch-src_util_memory.c:1.1
--- /dev/null   Fri Apr 14 21:35:06 2023
+++ pkgsrc/www/elinks/patches/patch-src_util_memory.c   Fri Apr 14 21:35:06 2023
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_util_memory.c,v 1.1 2023/04/14 21:35:06 nia Exp $
+
+Use macro to make mremap compatible to NetBSD
+
+--- src/util/memory.c.orig     2020-05-31 13:15:37.000000000 +0000
++++ src/util/memory.c
+@@ -21,6 +21,14 @@
+ #include "util/error.h"
+ #include "util/memory.h"
+ 
++#if defined(__NetBSD__)
++# define MREMAP(p, oldsz, newsz, f)    mremap(p, oldsz, NULL, newsz, 0)
++# define MREMAP_MAYMOVE    0
++#else
++# define MREMAP(p, oldsz, newsz, f)    mremap(p, oldsz, newsz, f)
++#endif
++
++
+ 
+ #if !defined(DEBUG_MEMLEAK) && !defined(CONFIG_FASTMEM)
+ 
+@@ -165,7 +173,7 @@ mem_mmap_realloc(void *p, size_t old_siz
+ 
+       if (new_size) {
+ #ifdef HAVE_MREMAP
+-              void *p2 = mremap(p, round_size(old_size), round_size(new_size), MREMAP_MAYMOVE);
++              void *p2 = MREMAP(p, round_size(old_size), round_size(new_size), MREMAP_MAYMOVE);
+ 
+               if (p2 != MAP_FAILED)
+                       return p2;



Home | Main Index | Thread Index | Old Index