Date: Fri, 31 May 2013 13:17:42 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319490 - head/www/sarg Message-ID: <201305311317.r4VDHg0H097404@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Fri May 31 13:17:41 2013 New Revision: 319490 URL: http://svnweb.freebsd.org/changeset/ports/319490 Log: - Remove bashisms from configure.in - Fix libinconv and libintl linking - Bump PORTREVISION PR: ports/178465 (based on) Submitted by: John Marino <draco@marino.st> Modified: head/www/sarg/Makefile Modified: head/www/sarg/Makefile ============================================================================== --- head/www/sarg/Makefile Fri May 31 12:36:02 2013 (r319489) +++ head/www/sarg/Makefile Fri May 31 13:17:41 2013 (r319490) @@ -3,6 +3,7 @@ PORTNAME= sarg PORTVERSION= 2.3.6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -34,6 +35,7 @@ MAN1= sarg.1 .if ${PORT_OPTIONS:MNLS} PLIST_SUB+= NLS="" USES+= gettext +EXTRA_LDFLAGS= -lintl .else PLIST_SUB+= NLS="@comment " CONFIGURE_ARGS+=--disable-nls @@ -71,6 +73,7 @@ CONFIGURE_ARGS+=--without-ldap .if ${PORT_OPTIONS:MICONV} CONFIGURE_ARGS+=--with-iconv USES+= iconv +EXTRA_LDFLAGS+= -liconv .else CONFIGURE_ARGS+=--without-iconv .endif @@ -80,8 +83,11 @@ post-extract: @${CHMOD} 0755 ${WRKSRC}/configure post-patch: -.if ${PORT_OPTIONS:MNLS} - @${REINPLACE_CMD} -e '/^LIBS/ s/$$/ -lintl/' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e '/test .*==/ s/==/=/' \ + ${WRKSRC}/configure.in +.if ${PORT_OPTIONS:MNLS} || ${PORT_OPTIONS:MICONV} + @${REINPLACE_CMD} -e '/^LIBS/ s/$$/ ${EXTRA_LDFLAGS}/' \ + ${WRKSRC}/Makefile.in .endif pre-configure:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305311317.r4VDHg0H097404>