Date: Sat, 17 Dec 2016 12:57:19 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428735 - in head/devel/readline: . files Message-ID: <201612171257.uBHCvJQC078088@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Dec 17 12:57:19 2016 New Revision: 428735 URL: https://svnweb.freebsd.org/changeset/ports/428735 Log: - Sort INFO - Convert to options target helper - Cosmetic change - Silence patch message - Do not silence installation message - Simplify patch file - Pet portlint: fix diff header of patch file Deleted: head/devel/readline/files/patch-support-shlib-install Modified: head/devel/readline/Makefile head/devel/readline/files/patch-support-shobj-conf Modified: head/devel/readline/Makefile ============================================================================== --- head/devel/readline/Makefile Sat Dec 17 12:57:13 2016 (r428734) +++ head/devel/readline/Makefile Sat Dec 17 12:57:19 2016 (r428735) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= readline -PORTVERSION= 6.3${PATCHLEVEL} +PORTVERSION= 6.3.${PATCHLEVEL} CATEGORIES= devel -MASTER_SITES= GNU \ - ftp://ftp.cwru.edu/pub/bash/ -DISTNAME= ${PORTNAME}-${PORTVERSION:C/^([0-9].[0-9]).*/\1/} +MASTER_SITES= GNU +DISTNAME= ${PORTNAME}-${PORTVERSION:R} PATCH_SITES= GNU/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}-patches @@ -19,30 +18,26 @@ OPTIONS_DEFINE= TERMCAP DOCS OPTIONS_DEFAULT=TERMCAP TERMCAP_DESC= Link against libtermcap -USES= cpe -CPE_VENDOR= gnu -CPE_VERSION= ${PORTVERSION:C/${PATCHLEVEL}$//} -CPE_UPDATE= ${PATCHLEVEL:C/^\.//} GNU_CONFIGURE= yes USE_LDCONFIG= yes +USES= cpe -INFO= readline rluserman history +INFO= history readline rluserman + +CPE_VENDOR= gnu +CPE_VERSION= ${PORTVERSION:R} +CPE_UPDATE= ${PATCHLEVEL} PATCHES= 1 2 3 4 5 6 7 8 -.for p in ${PATCHES:S/^/00/} -PATCHFILES+= ${PORTNAME}${PORTVERSION:R:S/.//}-${p:C/.*(...)$/\1/} +PATCHLEVEL= ${PATCHES:Q:S|\ |.|g:E} +.for patch in ${PATCHES:S|^|00|} +PATCHFILES+= ${PORTNAME}${PORTVERSION:R:S|.||}-${patch:C|.*(...)$|\1|} .endfor -PATCHLEVEL= ${PATCHES:M1:S/1/./}${PATCHES:Q:S/^/./:S/ /./g:E} - -.include <bsd.port.options.mk> -pre-configure: -.if ${PORT_OPTIONS:MTERMCAP} - ${REINPLACE_CMD} "s/SHOBJ_LDFLAGS =/SHOBJ_LDFLAGS = -ltermcap/" ${WRKSRC}/shlib/Makefile.in -.endif +post-patch-TERMCAP-on: + @${REINPLACE_CMD} -e '/SHOBJ_LDFLAGS = / s| = |&-ltermcap |' ${WRKSRC}/shlib/Makefile.in post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libreadline.so.6 \ - ${STAGEDIR}${PREFIX}/lib/libhistory.so.6 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libhistory.so.6 ${STAGEDIR}${PREFIX}/lib/libreadline.so.6 .include <bsd.port.mk> Modified: head/devel/readline/files/patch-support-shobj-conf ============================================================================== --- head/devel/readline/files/patch-support-shobj-conf Sat Dec 17 12:57:13 2016 (r428734) +++ head/devel/readline/files/patch-support-shobj-conf Sat Dec 17 12:57:19 2016 (r428735) @@ -1,20 +1,6 @@ ---- support/shobj-conf.orig 2009-10-28 14:20:21.000000000 +0100 -+++ support/shobj-conf 2011-11-05 18:02:22.000000000 +0100 -@@ -118,7 +118,7 @@ - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' - ;; - --freebsd2*) -+freebsd2.*) - SHOBJ_CFLAGS=-fpic - SHOBJ_LD=ld - SHOBJ_LDFLAGS='-x -Bshareable' -@@ -128,25 +128,18 @@ - ;; - - # FreeBSD-3.x ELF --freebsd3*|freebsdaout*) -+freebsd3.*|freebsdaout*) +--- support/shobj-conf.orig 2009-10-28 13:20:21 UTC ++++ support/shobj-conf +@@ -128,17 +128,10 @@ SHOBJ_CFLAGS=-fPIC SHOBJ_LD='${CC}' @@ -32,7 +18,3 @@ ;; # FreeBSD-4.x and later have only ELF - freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*|dragonfly*) - SHOBJ_CFLAGS=-fPIC - SHOBJ_LD='${CC}' -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612171257.uBHCvJQC078088>