Index: head/devel/readline/Makefile =================================================================== --- head/devel/readline/Makefile (revision 562672) +++ head/devel/readline/Makefile (revision 562673) @@ -1,49 +1,53 @@ # Created by: Frank Laszlo # $FreeBSD$ PORTNAME= readline -PORTVERSION= 8.0.${PATCHLEVEL} -PORTREVISION= 1 +PORTVERSION= 8.1.${PATCHLEVEL} CATEGORIES= devel MASTER_SITES= GNU DISTNAME= ${PORTNAME}-${PORTVERSION:R} PATCH_SITES= GNU/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}-patches MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library for editing command lines as they are typed LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING USES= cpe GNU_CONFIGURE= yes USE_LDCONFIG= yes INFO= history readline rluserman +PLIST_SUB= PORTVERSION=${PORTVERSION:R} PORTDOCS= CHANGES INSTALL README CPE_VENDOR= gnu CPE_VERSION= ${PORTVERSION:R} -CPE_UPDATE= ${PATCHLEVEL} OPTIONS_DEFINE= DOCS -PATCHES= 1 2 3 4 +# https://ftp.gnu.org/gnu/readline/readline-8.1-patches/ +#PATCHES= 1 +.if defined(PATCHES) +CPE_UPDATE= ${PATCHLEVEL} PATCHLEVEL= ${PATCHES:O:[-1]} -#PATCHLEVEL= 0 .for patch in ${PATCHES} PATCHFILES+= ${PORTNAME}${PORTVERSION:R:S|.||}-${patch:S|^|00|:S|.*(...)$|\1|} .endfor +.else +PATCHLEVEL= 0 +.endif post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/rlconf.h .if exists(/usr/lib/libtermcapw.so) @${REINPLACE_CMD} 's|-ltermcap|-ltermcapw|g' ${WRKSRC}/configure .endif post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libhistory.so.8.0 ${STAGEDIR}${PREFIX}/lib/libreadline.so.8.0 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libhistory.so ${STAGEDIR}${PREFIX}/lib/libreadline.so .include Index: head/devel/readline/distinfo =================================================================== --- head/devel/readline/distinfo (revision 562672) +++ head/devel/readline/distinfo (revision 562673) @@ -1,11 +1,3 @@ -TIMESTAMP = 1582888984 -SHA256 (readline-8.0.tar.gz) = e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461 -SIZE (readline-8.0.tar.gz) = 2975937 -SHA256 (readline80-001) = d8e5e98933cf5756f862243c0601cb69d3667bb33f2c7b751fe4e40b2c3fd069 -SIZE (readline80-001) = 927 -SHA256 (readline80-002) = 36b0febff1e560091ae7476026921f31b6d1dd4c918dcb7b741aa2dad1aec8f7 -SIZE (readline80-002) = 1401 -SHA256 (readline80-003) = 94ddb2210b71eb5389c7756865d60e343666dfb722c85892f8226b26bb3eeaef -SIZE (readline80-003) = 2158 -SHA256 (readline80-004) = b1aa3d2a40eee2dea9708229740742e649c32bb8db13535ea78f8ac15377394c -SIZE (readline80-004) = 1275 +TIMESTAMP = 1607881357 +SHA256 (readline-8.1.tar.gz) = f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02 +SIZE (readline-8.1.tar.gz) = 2993288 Index: head/devel/readline/files/patch-support-shlib-install =================================================================== --- head/devel/readline/files/patch-support-shlib-install (revision 562672) +++ head/devel/readline/files/patch-support-shlib-install (nonexistent) @@ -1,50 +0,0 @@ ---- support/shlib-install.orig 2018-05-04 13:45:39 UTC -+++ support/shlib-install -@@ -118,7 +118,7 @@ INSTALL_LINK2='${echo} cd $INSTALLDIR && ${echo} ${LN} - # Create symlinks to the installed library. This section is incomplete. - # - case "$host_os-$host_vendor" in --*linux*|freebsd*-gentoo) -+*linux*|freebsd*|dragonfly*) - # libname.so.M -> libname.so.M.N - ${echo} ${RM} ${INSTALLDIR}/$LINK2 - if [ -z "$uninstall" ]; then -@@ -154,38 +154,6 @@ solaris2*|aix4.[2-9]*|aix[5-9]*|osf*|irix[56]*|sysv[45 - fi - ;; - -- --# FreeBSD 3.x and above can have either a.out or ELF shared libraries --freebsd3*|freebsdaout*) -- if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then -- # libname.so -> libname.so.M -- ${echo} ${RM} ${INSTALLDIR}/$LINK1 -- if [ -z "$uninstall" ]; then -- eval $INSTALL_LINK1 -- fi -- else -- # libname.so.M -> libname.so.M.N -- ${echo} ${RM} ${INSTALLDIR}/$LINK2 -- if [ -z "$uninstall" ]; then -- eval $INSTALL_LINK2 -- fi -- -- # libname.so -> libname.so.M.N -- ${echo} ${RM} ${INSTALLDIR}/$LINK1 -- if [ -z "$uninstall" ]; then -- eval $INSTALL_LINK1 -- fi -- fi -- ;; -- --freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*|dragonfly*) -- # libname.so -> libname.so.M -- ${echo} ${RM} ${INSTALLDIR}/$LINK1 -- if [ -z "$uninstall" ]; then -- eval $INSTALL_LINK1 -- fi -- ;; -- - hpux1*) - # libname.sl -> libname.M - ${echo} ${RM} ${INSTALLDIR}/$LINK1.sl Property changes on: head/devel/readline/files/patch-support-shlib-install ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/readline/files/patch-support-shobj-conf =================================================================== --- head/devel/readline/files/patch-support-shobj-conf (revision 562672) +++ head/devel/readline/files/patch-support-shobj-conf (nonexistent) @@ -1,55 +0,0 @@ ---- support/shobj-conf.orig 2016-10-05 20:02:11 UTC -+++ support/shobj-conf -@@ -123,51 +123,13 @@ sunos5*|solaris2*) - ;; - - # All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd. --linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo) -+linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*|dragonfly*) - SHOBJ_CFLAGS=-fPIC - SHOBJ_LD='${CC}' - SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' - - SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' -- ;; -- --freebsd2*) -- SHOBJ_CFLAGS=-fpic -- SHOBJ_LD=ld -- SHOBJ_LDFLAGS='-x -Bshareable' -- -- SHLIB_XLDFLAGS='-R$(libdir)' -- SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' -- ;; -- --# FreeBSD-3.x ELF --freebsd3*|freebsdaout*) -- SHOBJ_CFLAGS=-fPIC -- SHOBJ_LD='${CC}' -- -- if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then -- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' -- -- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir)' -- SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' -- else -- SHOBJ_LDFLAGS='-shared' -- -- SHLIB_XLDFLAGS='-R$(libdir)' -- SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' -- fi -- ;; -- --# FreeBSD-4.x and later have only ELF --freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*|dragonfly*) -- SHOBJ_CFLAGS=-fPIC -- SHOBJ_LD='${CC}' -- -- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' -- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir)' -- -- SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' - ;; - - # Darwin/MacOS X Property changes on: head/devel/readline/files/patch-support-shobj-conf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/readline/pkg-plist =================================================================== --- head/devel/readline/pkg-plist (revision 562672) +++ head/devel/readline/pkg-plist (revision 562673) @@ -1,31 +1,31 @@ include/readline/chardefs.h include/readline/history.h include/readline/keymaps.h include/readline/readline.h include/readline/rlconf.h include/readline/rlstdc.h include/readline/rltypedefs.h include/readline/tilde.h lib/libhistory.a lib/libhistory.so lib/libhistory.so.8 -lib/libhistory.so.8.0 +lib/libhistory.so.%%PORTVERSION%% lib/libreadline.a lib/libreadline.so lib/libreadline.so.8 -lib/libreadline.so.8.0 +lib/libreadline.so.%%PORTVERSION%% libdata/pkgconfig/readline.pc man/man3/history.3.gz man/man3/readline.3.gz %%DATADIR%%/excallback.c %%DATADIR%%/fileman.c %%DATADIR%%/histexamp.c %%DATADIR%%/manexamp.c %%DATADIR%%/rl-fgets.c %%DATADIR%%/rl.c %%DATADIR%%/rlbasic.c %%DATADIR%%/rlcat.c %%DATADIR%%/rlevent.c %%DATADIR%%/rlptytest.c %%DATADIR%%/rltest.c %%DATADIR%%/rlversion.c