From owner-freebsd-python@FreeBSD.ORG  Fri Oct 18 06:44:17 2013
Return-Path: <owner-freebsd-python@FreeBSD.ORG>
Delivered-To: python@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D2FA4687;
 Fri, 18 Oct 2013 06:44:17 +0000 (UTC) (envelope-from mva@FreeBSD.org)
Received: from smtprelay05.ispgateway.de (smtprelay05.ispgateway.de
 [80.67.31.98])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 67D6823BC;
 Fri, 18 Oct 2013 06:44:17 +0000 (UTC)
Received: from [89.183.8.149] (helo=localhost)
 by smtprelay05.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256)
 (Exim 4.68) (envelope-from <mva@FreeBSD.org>)
 id 1VX3n6-0004Oc-T8; Fri, 18 Oct 2013 08:44:09 +0200
Date: Fri, 18 Oct 2013 08:44:09 +0200
From: Marcus von Appen <mva@FreeBSD.org>
To: Andriy Gapon <avg@FreeBSD.org>, python@FreeBSD.org
Subject: Re: PYDISTUTILS_AUTOPLIST, stage, man pages
Message-ID: <20131018064409.GA1412@medusa.sysfault.org>
Mail-Followup-To: Andriy Gapon <avg@FreeBSD.org>, python@FreeBSD.org
References: <5260203B.6060502@FreeBSD.org>
 <20131017181944.GA1374@medusa.sysfault.org>
 <52604530.6040209@FreeBSD.org>
 <20131017220703.GA24842@medusa.sysfault.org>
 <5260CA83.8080503@FreeBSD.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="17pEHd4RhPHOinZp"
Content-Disposition: inline
In-Reply-To: <5260CA83.8080503@FreeBSD.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
X-Df-Sender: MTEyNTc0Mg==
X-BeenThere: freebsd-python@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: Marcus von Appen <mva@FreeBSD.org>
List-Id: FreeBSD-specific Python issues <freebsd-python.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-python>,
 <mailto:freebsd-python-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-python>
List-Post: <mailto:freebsd-python@freebsd.org>
List-Help: <mailto:freebsd-python-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-python>,
 <mailto:freebsd-python-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 06:44:17 -0000


--17pEHd4RhPHOinZp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On, Fri Oct 18, 2013, Andriy Gapon wrote:

> on 18/10/2013 01:07 Marcus von Appen said the following:
> > Except for the fact that 'share/' is wrong for FreeBSD (which you know,
> > I guess ;-), I see what you mean. A fix for that might be to check the
> > directory for something matching on
> >
> >           man/man[0-9]/*.[0-9]
> >
> > and append it automatically with a .gz in the ${_PYTHONPKGLIST} record
> > file within the add-plist-pymod target in bsd.python.mk
> >
> > Can you upload the port shar somewhere for a test?
>
> The port is here:
> https://redports.org/browser/avg/sysutils/py-obnam
> It also depends on the following four new ports (all matching py-*):
> https://redports.org/browser/avg/devel
>
> In the current shape the port "works", but installs the man pages into a wrong
> place.  If I fix it like this:
>
> Index: Makefile
> ===================================================================
> --- Makefile	(revision 18184)
> +++ Makefile	(working copy)
> @@ -26,4 +26,7 @@
>  USE_PYDISTUTILS=	yes
>  PYDISTUTILS_AUTOPLIST=	yes
>
> +post-patch:
> +	${REINPLACE_CMD} 's#share/man#man#' ${WRKSRC}/${PYSETUP}
> +
>  .include <bsd.port.mk>
>
> Then installation fails because auto-generated plist and what's in stage
> directory do not match.
>
> Thank you!

Can you give the following change to Mk/bsd.python.mk a try:

Index: Mk/bsd.python.mk
===================================================================
--- Mk/bsd.python.mk	(revision 330721)
+++ Mk/bsd.python.mk	(working copy)
@@ -528,7 +528,9 @@
 		${SED} '/^\.$$/d' > ${WRKDIR}/.localmtree
 	@${ECHO_CMD} "${_RELSITELIBDIR}" >> ${WRKDIR}/.localmtree
 	@${ECHO_CMD} "${_RELLIBDIR}" >> ${WRKDIR}/.localmtree
-	@${SED} 's|^${PREFIX}/||' ${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST}
+	@${SED} -e 's|^${PREFIX}/||' \
+		-e 's|^\(man/man[0-9]\)/\(.*.[0-9]\)|\1/\2${MANEXT}|' \
+		${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST}
 	@${SED} -e 's|^${PREFIX}/\(.*\)/\(.*\)|\1|' ${_PYTHONPKGLIST} | \
 		${AWK} '{ num = split($$0, a, "/"); res=""; \
 					for(i = 1; i <= num; ++i) { \

It adds the .gz to every man/manX/*.X, if it is defined (depending on
the NO_MANCOMPRESS setting).

Cheers
Marcus

--17pEHd4RhPHOinZp
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (FreeBSD)

iEYEARECAAYFAlJg2LkACgkQi68/ErJnpkf8RQCeM6BVywFtJJ/LNlCteeyg+Qpy
Mj4AoIBH5I6bUSya343kStcoMwM5G6Pr
=/cYc
-----END PGP SIGNATURE-----

--17pEHd4RhPHOinZp--