svn commit: r335693 - head/www/xapian-omega

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Thu Dec  5 20:26:29 2013
New Revision: 335693
URL: http://svnweb.freebsd.org/changeset/ports/335693

Log:
  - Update to 1.2.16
  - Respect DATADIR
  - Simplify Makefile
  
  Changes:	http://trac.xapian.org/wiki/ReleaseOverview/1.2.16

Modified:
  head/www/xapian-omega/Makefile
  head/www/xapian-omega/distinfo
  head/www/xapian-omega/pkg-plist

Modified: head/www/xapian-omega/Makefile
==============================================================================
--- head/www/xapian-omega/Makefile	Thu Dec  5 20:26:23 2013	(r335692)
+++ head/www/xapian-omega/Makefile	Thu Dec  5 20:26:29 2013	(r335693)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xapian-omega
-PORTVERSION=	1.2.15
+PORTVERSION=	1.2.16
 CATEGORIES=	www
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION}/ \
 		LOCAL/sunpoet
@@ -21,12 +21,14 @@ ICONV_DESC=	Enable iconv character set c
 
 PORTSCOUT=	limitw:1,even
 
+CONFIGURE_ARGS=	--datarootdir=${DATADIR} --docdir=${DOCSDIR}
 CONFIGURE_ENV=	PCRE_CONFIG=${LOCALBASE}/bin/pcre-config \
 		XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
+USE_XZ=		yes
 USES=		perl5 shebangfix
 
 MORE_PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
@@ -41,25 +43,16 @@ ICONV_CONFIGURE_WITH=	iconv
 ICONV_LDFLAGS=		${ICONV_LIB}
 ICONV_USES=		iconv
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} \
 		-e '/^dist_sysconf_DATA = /d' \
 		-e '/^pkglibbindir = / s| = .*$$| = ${WWWDIR}/cgi-bin|' \
 			${WRKSRC}/Makefile.in
-.if !${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| docs||' ${WRKSRC}/Makefile.in
-.endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${MORE_PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
-.endif
 
 .include <bsd.port.mk>

Modified: head/www/xapian-omega/distinfo
==============================================================================
--- head/www/xapian-omega/distinfo	Thu Dec  5 20:26:23 2013	(r335692)
+++ head/www/xapian-omega/distinfo	Thu Dec  5 20:26:29 2013	(r335693)
@@ -1,2 +1,2 @@
-SHA256 (xapian-omega-1.2.15.tar.gz) = 3c51bbce59e8d18459983e10046183f42eb5ee79b5143ea612c27f1cd6338b9d
-SIZE (xapian-omega-1.2.15.tar.gz) = 627733
+SHA256 (xapian-omega-1.2.16.tar.xz) = 63df364780b3c5dd0242dccc6d1dc5059292077cc1e2746f38d5f3695ab7fabe
+SIZE (xapian-omega-1.2.16.tar.xz) = 417224

Modified: head/www/xapian-omega/pkg-plist
==============================================================================
--- head/www/xapian-omega/pkg-plist	Thu Dec  5 20:26:23 2013	(r335692)
+++ head/www/xapian-omega/pkg-plist	Thu Dec  5 20:26:29 2013	(r335693)
@@ -5,10 +5,11 @@ bin/omindex
 bin/scriptindex
 man/man1/omindex.1.gz
 man/man1/scriptindex.1.gz
-share/omega/htdig2omega.script
-share/omega/mbox2omega.script
+%%DATADIR%%/omega/htdig2omega.script
+%%DATADIR%%/omega/mbox2omega.script
 %%WWWDIR%%/cgi-bin/omega
 %%WWWDIR%%/cgi-bin/outlookmsg2html
 @dirrm %%WWWDIR%%/cgi-bin
 @dirrm %%WWWDIR%%
- at dirrm share/omega
+ at dirrm %%DATADIR%%/omega
+ at dirrm %%DATADIR%%