svn commit: r387513 - in head/archivers/dpkg: . files

[Pawel Pekala]

Author: pawel
Date: Tue May 26 19:56:58 2015
New Revision: 387513
URL: https://svnweb.freebsd.org/changeset/ports/387513

Log:
  - Drop run dependency on sysutils/coreutils, checksums are now
    calculated by perl functions
  - Port now compiles fine with warnings switches, don't turn them off
  - Remove configure PERL_LIBDIR patch, we set PERL_LIBDIR in
    CONFIGURE_ENV so perl libdir path is set properly
  - Remove obsolete REINPLACE_CMD commands, in latest release all that
    stuff was fixed and I missed it in last port update
  - Fix build on current, libdpkg uses md5 checksum functions from libmd
    while not listing it as linking dependency, new clang doesn't like it:
  
    CCLD     dpkg-deb
  ./lib/dpkg/.libs/libdpkg.a(buffer.o): In function `buffer_digest':
  buffer.c:(.text+0x44): undefined reference to `_libmd_MD5Init'
  buffer.c:(.text+0x52): undefined reference to `_libmd_MD5Update'
  ./lib/dpkg/.libs/libdpkg.a(buffer.o): In function `buffer_digest_done':
  buffer.c:(.text+0xbf): undefined reference to `_libmd_MD5Final'
  ./lib/dpkg/.libs/libdpkg.a(buffer.o): In function `buffer_copy':
  buffer.c:(.text+0x2fc): undefined reference to `_libmd_MD5Init'
  buffer.c:(.text+0x39f): undefined reference to `_libmd_MD5Update'
  cc: error: linker command failed with exit code 1 (use -v to see invocation)

Deleted:
  head/archivers/dpkg/files/patch-configure
Modified:
  head/archivers/dpkg/Makefile

Modified: head/archivers/dpkg/Makefile
==============================================================================
--- head/archivers/dpkg/Makefile	Tue May 26 19:22:48 2015	(r387512)
+++ head/archivers/dpkg/Makefile	Tue May 26 19:56:58 2015	(r387513)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dpkg
 PORTVERSION=	1.18.0
+PORTREVISION=	1
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	dpkg_${PORTVERSION}
@@ -14,8 +15,7 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	po4a:${PORTSDIR}/textproc/po4a
 RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar \
-		gpatch:${PORTSDIR}/devel/patch \
-		gmd5sum:${PORTSDIR}/sysutils/coreutils
+		gpatch:${PORTSDIR}/devel/patch
 
 GNU_CONFIGURE=	yes
 USES=		cpe gmake iconv libtool perl5 pkgconfig tar:xz
@@ -30,7 +30,7 @@ SUB_LIST+=	DPKGDIR=${DPKGDIR}
 
 CONFIGURE_ARGS+=--with-admindir=${DPKGDIR} --libdir=${PREFIX}/libexec \
 		--program-transform-name="" --with-libintl-prefix=${LOCALBASE} \
-		--disable-compiler-warnings --with-logdir=/var/log
+		--with-logdir=/var/log
 CONFIGURE_ENV+=	PERL_LIBDIR="${PREFIX}/${SITE_PERL_REL}"
 
 OPTIONS_DEFINE=	NLS
@@ -40,14 +40,8 @@ NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 post-patch:
-	@${REINPLACE_CMD} 's|-t$$host|-t${ARCH}-freebsd|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -E 's/(md5|sha1|sha256)sum/g&/g' \
-		${WRKSRC}/scripts/Dpkg/Checksums.pm
-	@${REINPLACE_CMD} -e 's/cp -p $$(DEST/mv $$(DEST/g; s/rm $$(/rm -f $$(/g' \
-		${WRKSRC}/scripts/mk/Makefile.in \
-		${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} 's/{^MATCH}/\&/' ${WRKSRC}/dselect/mkcurkeys.pl
+	@${REINPLACE_CMD} '/^LDFLAGS/ s|$$| -lmd|' \
+		${WRKSRC}/lib/dpkg/Makefile.in
 
 post-install:
 	(cd ${STAGEDIR}${DPKGDIR} && ${MKDIR} available diversions \