Date: Thu, 29 Aug 2002 10:56:24 +0200 From: Oliver Braun <obraun@informatik.unibw-muenchen.de> To: ports@freebsd.org Cc: lioux@freebsd.org, B.Candler@pobox.com, dwcjr@freebsd.org, jos@catnook.com Subject: Please review patch (was: ports/42074: rsync depends on many other packages - popt dependencies?) Message-ID: <20020829085624.GA63657@informatik.unibw-muenchen.de> In-Reply-To: <200208271204.g7RC4jBG049111@www.freebsd.org> References: <200208271204.g7RC4jBG049111@www.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--VrqPEDrXMn8OVzN4
Content-Type: multipart/mixed; boundary="AqsLC8rIMeq19msA"
Content-Disposition: inline
--AqsLC8rIMeq19msA
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
* Brian Candler <B.Candler@pobox.com> [2002-08-27 14:04 +0200]:
> Possibly as a result of change ports/37348, rsync now depends on a
> whole bunch of other packages including an XML parser!
> This is a bit of a pain in a server environment where you want to
> install the minimum amount of shrapnel. libpopt I will accept, but
> the rest seem irrelevant to rsync.
> expat/libiconv/gettext are dependencies of popt, so I guess the
> question really is why a command-line option parser depends on those
> things?
Find attached a patch I want to commit:
* define WITH_POPT_PORT to build net/rsync with devel/popt and all
dependencies.
* default behaviour is to use included popt. So, the package does not
depend on devel/popt
Lioux, does devel/popt need all these dependencies, or is it possible to
remove the dependency on gettext at least by default and make gettext
support optional?
As I have mentioned before in my previous mail, the rsync developers
want to drop the included version of popt in one of the next upcoming
releases. Maybe we can argue them to keep popt (Jos)?
Anyone any comments?
If everyone is happy and David approves it, I am going to commit the
patch this weekend, so that 4.7-R packages won't depend on
popt/expat/libiconv/gettext.
Regards,
Olli
--=20
=AB: IST & IIS _ INF _ UniBwM :: obraun@informatik.unibw-muenchen.de :=
=BB
=AB: Tele-Consulting GmbH :: obraun@Tele-Consulting.com :=
=BB
=AB: FreeBSD Commmitter :: obraun@FreeBSD.org :=
=BB
--AqsLC8rIMeq19msA
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/net/rsync/Makefile,v
retrieving revision 1.76
diff -u -r1.76 Makefile
--- Makefile 21 Aug 2002 14:46:05 -0000 1.76
+++ Makefile 29 Aug 2002 08:32:49 -0000
@@ -17,12 +17,18 @@
=20
MAINTAINER=3D obraun@FreeBSD.org
=20
+.if defined(WITH_POPT_PORT)
LIB_DEPENDS=3D popt.0:${PORTSDIR}/devel/popt
+.endif
=20
USE_REINPLACE=3D yes
GNU_CONFIGURE=3D yes
+.if defined(WITH_POPT_PORT)
CONFIGURE_ENV=3D CFLAGS=3D"-I${LOCALBASE}/include" \
LIBS=3D"-L${LOCALBASE}/lib"
+.else
+CONFIGURE_ARGS=3D --with-included-popt
+.endif
=20
.include <bsd.port.pre.mk>
=20
@@ -37,12 +43,19 @@
.endif
=20
.if ${OSVERSION} >=3D 400014
-CONFIGURE_ARGS=3D --disable-debug --enable-ipv6
+CONFIGURE_ARGS+=3D --disable-debug --enable-ipv6
.else
-CONFIGURE_ARGS=3D --disable-debug --disable-ipv6
+CONFIGURE_ARGS+=3D --disable-debug --disable-ipv6
.endif
MAN1=3D rsync.1
MAN5=3D rsyncd.conf.5
+
+.if !defined(WITH_POPT_PORT)
+pre-everything::
+ @${ECHO_CMD} "rsync comes with an included version of popt."
+ @${ECHO_CMD} "To build rsync with devel/popt instead,"
+ @${ECHO_CMD} "hit Ctrl-C now and define WITH_POPT_PORT"
+.endif
=20
pre-configure:
@${REINPLACE_CMD} -e 's:/etc/:${PREFIX}/etc/:g' \
--AqsLC8rIMeq19msA--
--VrqPEDrXMn8OVzN4
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (FreeBSD)
iD8DBQE9beG4wLFrfe8lsboRAupuAKCBzp8QxpP9px4KOvYCurDbSp2PAgCgiUoc
nDR9xr+F8RFOJs+FFnIiBEc=
=pb3r
-----END PGP SIGNATURE-----
--VrqPEDrXMn8OVzN4--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020829085624.GA63657>