From owner-svn-ports-all@freebsd.org Sat Dec 17 12:57:20 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A28DC8457D; Sat, 17 Dec 2016 12:57:20 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 350ED1A4E; Sat, 17 Dec 2016 12:57:20 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBHCvJhD078090; Sat, 17 Dec 2016 12:57:19 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBHCvJQC078088; Sat, 17 Dec 2016 12:57:19 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201612171257.uBHCvJQC078088@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 17 Dec 2016 12:57:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428735 - in head/devel/readline: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Dec 2016 12:57:20 -0000 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 -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 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}' -