Date: Sun, 11 Sep 2016 20:15:09 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421874 - head/net/gnu-dico Message-ID: <201609112015.u8BKF9dc054468@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sun Sep 11 20:15:09 2016 New Revision: 421874 URL: https://svnweb.freebsd.org/changeset/ports/421874 Log: - Update to 2.3 - While here, convert to options helpers PR: 212401 Submitted by: goran.tal@gmail.com (maintainer) Modified: head/net/gnu-dico/Makefile head/net/gnu-dico/distinfo head/net/gnu-dico/pkg-plist Modified: head/net/gnu-dico/Makefile ============================================================================== --- head/net/gnu-dico/Makefile Sun Sep 11 19:57:47 2016 (r421873) +++ head/net/gnu-dico/Makefile Sun Sep 11 20:15:09 2016 (r421874) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dico -PORTVERSION= 2.2 -PORTREVISION= 6 +PORTVERSION= 2.3 CATEGORIES= net textproc MASTER_SITES= GNU PKGNAMEPREFIX= gnu- @@ -14,89 +13,51 @@ COMMENT= Flexible modular implementation LIB_DEPENDS= libltdl.so:devel/libltdl USE_LDCONFIG= yes -USES= tar:xz gmake libtool +USES= tar:xz gmake libtool localbase pkgconfig GNU_CONFIGURE= yes -CFLAGS+= -Wno-error=return-type -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var -OPTIONS_DEFINE= PYTHON GUILE PCRE GSASL PAM LDAP -OPTIONS_DEFAULT= PYTHON GUILE PCRE +INFO= dico + +PLIST_SUB= PORTVERSION=${PORTVERSION} +SUB_FILES= pkg-message +USE_RC_SUBR= dicod + +OPTIONS_DEFINE= PYTHON GUILE PCRE GSASL PAM LDAP NLS +OPTIONS_DEFAULT= PYTHON PCRE +OPTIONS_SUB= yes GSASL_DESC= GSASL support -.include <bsd.port.options.mk> +PYTHON_USES= python +PYTHON_CONFIGURE_ENV= PYTHON_CONFIG=${PYTHON_CMD}-config +PYTHON_CONFIGURE_OFF= --without-python -.if ${PORT_OPTIONS:MPYTHON} -USES+= python -CONFIGURE_ENV+= PYTHON_CONFIG=${PYTHON_CMD}-config -PLIST_SUB+= PYTHON="" -.else -CONFIGURE_ARGS+=--without-python -PLIST_SUB+= PYTHON="@comment " -.endif - -.if ${PORT_OPTIONS:MGUILE} -LIB_DEPENDS+= libguile.so:lang/guile -PLIST_SUB+= GUILE="" -.else -CONFIGURE_ARGS+=--without-guile -PLIST_SUB+= GUILE="@comment " -.endif - -.if ${PORT_OPTIONS:MPCRE} -LIB_DEPENDS+= libpcre.so:devel/pcre -PLIST_SUB+= PCRE="" -.else -CONFIGURE_ARGS+=--without-pcre -PLIST_SUB+= PCRE="@comment " -.endif - -.if ${PORT_OPTIONS:MGSASL} -LIB_DEPENDS+= libgsasl.so:security/gsasl -CONFIGURE_ARGS+=--with-gsasl -.else -CONFIGURE_ARGS+=--without-gsasl -.endif - -.if ${PORT_OPTIONS:MPAM} -PLIST_SUB+= PAM="" -CONFIGURE_ARGS+=--enable-pam -.else -PLIST_SUB+= PAM="@comment " -CONFIGURE_ARGS+=--disable-pam -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -PLIST_SUB+= LDAP="" -.else -CONFIGURE_ARGS+=--without-ldap -PLIST_SUB+= LDAP="@comment " -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +GUILE_LIB_DEPENDS= libguile-2.0.so:lang/guile2 +GUILE_CONFIGURE_OFF= --without-guile -INFO= dico +PCRE_LIB_DEPENDS= libpcre.so:devel/pcre +PCRE_CONFIGURE_OFF= --without-pcre -PLIST_SUB+= PORTVERSION=${PORTVERSION} -SUB_FILES+= pkg-message -USE_RC_SUBR= dicod +GSASL_LIB_DEPENDS= libgsasl.so:security/gsasl +GSASL_CONFIGURE_WITH= gsasl + +PAM_CONFIGURE_ENABLE= pam + +LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_OFF= --without-ldap + +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls post-patch: @${REINPLACE_CMD} 's/@bindir@/@sbindir@/' ${WRKSRC}/dicod/Makefile.in @${REINPLACE_CMD} 's/(bindir)..dir/&\/gdico/' ${WRKSRC}/dico/Makefile.in @${REINPLACE_CMD} '/INSTALL.*charset/d' ${WRKSRC}/gnu/Makefile.in @${REINPLACE_CMD} 's/python-config/$${PYTHON_CONFIG}/' ${WRKSRC}/configure + @${REINPLACE_CMD} 's/conf.5in dico/conf.5 dico/' ${WRKSRC}/doc/Makefile.in post-install: - @${INSTALL_DATA} ${FILESDIR}/dicod.conf ${STAGEDIR}${PREFIX}/etc/dicod.conf.sample + ${INSTALL_DATA} ${FILESDIR}/dicod.conf ${STAGEDIR}${PREFIX}/etc/dicod.conf.sample .include <bsd.port.mk> Modified: head/net/gnu-dico/distinfo ============================================================================== --- head/net/gnu-dico/distinfo Sun Sep 11 19:57:47 2016 (r421873) +++ head/net/gnu-dico/distinfo Sun Sep 11 20:15:09 2016 (r421874) @@ -1,2 +1,3 @@ -SHA256 (dico-2.2.tar.xz) = c474931e4e6f31fcff247f181d48448f18be4091750843536840f472809ef212 -SIZE (dico-2.2.tar.xz) = 1445224 +TIMESTAMP = 1473624817 +SHA256 (dico-2.3.tar.xz) = f38afa5771a70f2d3d72c409d664c20456de874f93d8b391141ba45ee3077e8d +SIZE (dico-2.3.tar.xz) = 1607960 Modified: head/net/gnu-dico/pkg-plist ============================================================================== --- head/net/gnu-dico/pkg-plist Sun Sep 11 19:57:47 2016 (r421873) +++ head/net/gnu-dico/pkg-plist Sun Sep 11 20:15:09 2016 (r421874) @@ -27,6 +27,8 @@ lib/dico/gcide.so %%GUILE%%lib/dico/guile.so %%LDAP%%lib/dico/ldap.a %%LDAP%%lib/dico/ldap.so +lib/dico/metaphone2.a +lib/dico/metaphone2.so lib/dico/nprefix.a lib/dico/nprefix.so lib/dico/outline.a @@ -48,9 +50,14 @@ lib/libdico.so lib/libdico.so.1 lib/libdico.so.1.0.0 libexec/idxgcide +man/man1/dico.1.gz +man/man5/dicod.conf.5.gz +man/man8/dicod.8.gz sbin/dicod %%DATADIR%%/%%PORTVERSION%%/include/pp-setup +%%NLS%%share/locale/da/LC_MESSAGES/dico.mo +%%NLS%%share/locale/de/LC_MESSAGES/dico.mo %%NLS%%share/locale/fi/LC_MESSAGES/dico.mo +%%NLS%%share/locale/fr/LC_MESSAGES/dico.mo %%NLS%%share/locale/pl/LC_MESSAGES/dico.mo %%NLS%%share/locale/uk/LC_MESSAGES/dico.mo -%%GUILE%%@dir share/guile/site/dico
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609112015.u8BKF9dc054468>