From tijl@coosemans.org  Thu Apr 24 21:13:51 2014
Return-Path: <tijl@coosemans.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 49E8D648
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Apr 2014 21:13:51 +0000 (UTC)
Received: from mailrelay009.isp.belgacom.be (mailrelay009.isp.belgacom.be [195.238.6.176])
	by mx1.freebsd.org (Postfix) with ESMTP id C012110B5
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Apr 2014 21:13:50 +0000 (UTC)
Received: from 119.163-241-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.241.163.119])
  by relay.skynet.be with ESMTP; 24 Apr 2014 23:13:48 +0200
Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1])
	by kalimero.tijl.coosemans.org (8.14.8/8.14.8) with ESMTP id s3OLDlNW023345
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Apr 2014 23:13:48 +0200 (CEST)
	(envelope-from tijl@kalimero.tijl.coosemans.org)
Received: (from tijl@localhost)
	by kalimero.tijl.coosemans.org (8.14.8/8.14.8/Submit) id s3OLDlgO023344;
	Thu, 24 Apr 2014 23:13:47 +0200 (CEST)
	(envelope-from tijl)
Message-Id: <201404242113.s3OLDlgO023344@kalimero.tijl.coosemans.org>
Date: Thu, 24 Apr 2014 23:13:47 +0200 (CEST)
From: Tijl Coosemans <tijl@FreeBSD.org>
Reply-To: Tijl Coosemans <tijl@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] www/mnogosearch: convert to USES=libtool + misc
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         188975
>Category:       ports
>Synopsis:       [patch] www/mnogosearch: convert to USES=libtool + misc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 24 21:20:01 UTC 2014
>Closed-Date:    Fri Apr 25 12:15:00 CEST 2014
>Last-Modified:  Fri Apr 25 12:15:00 CEST 2014
>Originator:     Tijl Coosemans
>Release:        FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
- Add DOCS and EXAMPLES options.
- Convert USE_AUTOTOOLS=libtool and USE_GNOME=lthack to USES=libtool.
  USE_GNOME=lthack is going away.
- Remove some remnants from older versions:
  * CONFIGURE_ARGS=--enable-shared.
  * CONFIGURE_ENV=LOCALBASE="${LOCALBASE}"
  * MAKE_ENV=MKDIRPROG="${MKDIR}"
  * CONFIGURE_ENV=LIBS="-pthread"
  * CFLAGS+=-DCONSOLE
  * pre-install target
- Don't set an so-version for libmnogosearch-3.4.so.  It's not needed
  and libmnogocharset-3.4.so doesn't have one either.
- Use new LIB_DEPENDS syntax.
- Replace NOPORTDOCS with PORT_OPTIONS.
- Replace STRIP_CMD with INSTALL_TARGET=install-strip.
- Don't cat pkg-message in post-install.  It's redundant with staging.
- Remove pkg-install script.  I cannot find any references to the
  directories it creates in the source code, but you might want to run-test
  this.

Redports: https://redports.org/buildarchive/20140424140201-12217/
>How-To-Repeat:
>Fix:

--- mnogosearch.patch begins here ---
Index: www/mnogosearch/Makefile
===================================================================
--- www/mnogosearch/Makefile	(revision 352018)
+++ www/mnogosearch/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mnogosearch
 PORTVERSION=	3.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.mnogosearch.org/Download/ \
 		http://www.bayofrum.net/dist/${PORTNAME}/
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	dpsearch-[0-9]* udmsearch-[0-9]* mguesser-[0-9]*
 
-OPTIONS_DEFINE=	THREADS SSL ASIAN SYSLOG
+OPTIONS_DEFINE=	DOCS EXAMPLES THREADS SSL ASIAN SYSLOG
 
 OPTIONS_MULTI=	database
 OPTIONS_MULTI_database=	PGSQL MSQL MYSQL SQLITE2 SQLITE3
@@ -28,19 +28,13 @@ SYSLOG_DESC=	Send logs to syslog
 SQLITE2_DESC=	Use SQLite 2.x
 SQLITE3_DESC=	Use SQLite 3.x
 
-USES=		gmake
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		gmake libtool
 USE_LDCONFIG=	yes
-USE_GNOME=	lthack
-USE_AUTOTOOLS=	libtool
-CONFIGURE_ARGS+=--enable-shared \
-		--sysconfdir=${ETCDIR} \
+CONFIGURE_ARGS=	--sysconfdir=${ETCDIR} \
 		--localstatedir=/var/mnogosearch \
 		--datadir=${DATADIR}
-CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}"
-MAKE_ENV+=	MKDIRPROG="${MKDIR}"
-
-PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
-SHLIB_VER=	1
 
 SUB_FILES+=	pkg-message
 
@@ -52,10 +46,8 @@ USE_OPENSSL=	yes
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=	--enable-pthreads
-CONFIGURE_ENV+=	LIBS="-pthread"
 .else
 CONFIGURE_ARGS+=	--disable-pthreads
-CFLAGS+=	-DCONSOLE
 .endif
 
 .if ${PORT_OPTIONS:MSSL}
@@ -76,7 +68,7 @@ CONFIGURE_ARGS+=	--with-pgsql=${LOCALBAS
 .endif
 
 .if ${PORT_OPTIONS:MMSQL}
-LIB_DEPENDS+=		msql.1:${PORTSDIR}/databases/msql
+LIB_DEPENDS+=		libmsql.so:${PORTSDIR}/databases/msql
 CONFIGURE_ARGS+=	--with-msql=${LOCALBASE}
 .endif
 
@@ -100,7 +92,7 @@ PORTDOCS=	ChangeLog INSTALL README.html
 PORTEXAMPLES=	README *.conf
 
 post-patch:
-.if !defined (NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's#$$(DESTDIR)$$(prefix)/doc#${DOCSDIR}#' \
 		${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in
 .else
@@ -109,22 +101,12 @@ post-patch:
 		${WRKSRC}/Makefile.in
 .endif
 
-pre-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-
 post-install:
-.for l in charset search
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmnogo$l-${PORTVERSION:R}.so
-.endfor
-	${LN} -sf libmnogosearch.so \
-		${STAGEDIR}${PREFIX}/lib/libmnogosearch-${PORTVERSION:R}.so.${SHLIB_VER}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS:NREADME.html}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/samples/* ${STAGEDIR}${EXAMPLESDIR}/
-	@${ECHO}
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: www/mnogosearch/pkg-install
===================================================================
--- www/mnogosearch/pkg-install	(revision 352018)
+++ www/mnogosearch/pkg-install	(working copy)
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-case $2 in
-    PRE-INSTALL)
-	;;
-    POST-INSTALL)
-	mkdir -m 755 /var/mnogosearch
-	mkdir -m 700 /var/mnogosearch/cache
-	mkdir -m 755 /var/mnogosearch/raw
-	mkdir -m 755 /var/mnogosearch/splitter
-	mkdir -m 755 /var/mnogosearch/tree
-	chown -R www:www /var/mnogosearch
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
Index: www/mnogosearch/pkg-plist
===================================================================
--- www/mnogosearch/pkg-plist	(revision 352018)
+++ www/mnogosearch/pkg-plist	(working copy)
@@ -72,12 +72,9 @@ include/udm_xmalloc.h
 include/udmsearch.h
 lib/libmnogocharset-3.4.so
 lib/libmnogocharset.a
-lib/libmnogocharset.la
 lib/libmnogocharset.so
 lib/libmnogosearch-3.4.so
-lib/libmnogosearch-3.4.so.%%SHLIB_VER%%
 lib/libmnogosearch.a
-lib/libmnogosearch.la
 lib/libmnogosearch.so
 man/man1/indexer.1.gz
 man/man5/indexer.conf.5.gz
--- mnogosearch.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->crees 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Apr 24 21:20:05 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=188975 

From: Chris Rees <crees@bayofrum.net>
To: "bug-followup@freebsd.org" <bug-followup@freebsd.org>,Tijl Coosemans <tijl@freebsd.org>
Cc:  
Subject: Re: ports/188975: [patch] www/mnogosearch: convert to USES=libtool + misc
Date: Fri, 25 Apr 2014 08:44:38 +0100

 ------R5TVV3V19ZIK77SF10Q15SV28258DB
 Content-Transfer-Encoding: 8bit
 Content-Type: text/plain;
  charset=UTF-8
 
 Thanks, please commit.
 
 Chris
 -- 
 Sent from my Android phone with K-9 Mail. Please excuse my brevity.
 -- 
 This message has been scanned for viruses and
 dangerous content by MailScanner, and is
 believed to be clean.
 
 
 ------R5TVV3V19ZIK77SF10Q15SV28258DB
 Content-Type: text/html;
  charset=utf-8
 Content-Transfer-Encoding: 8bit
 
 Thanks, please commit.<br>
 <br>
 Chris<br>
 -- <br>
 Sent from my Android phone with K-9 Mail. Please excuse my brevity.<br />-- 
 <br />This message has been scanned for viruses and
 <br />dangerous content by
 <a href="http://www.mailscanner.info/"><b>MailScanner</b></a>, and is
 <br />believed to be clean.
 
 
 
 ------R5TVV3V19ZIK77SF10Q15SV28258DB--
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/188975: commit references a PR
Date: Fri, 25 Apr 2014 08:13:45 +0000 (UTC)

 Author: tijl
 Date: Fri Apr 25 08:13:41 2014
 New Revision: 352096
 URL: http://svnweb.freebsd.org/changeset/ports/352096
 QAT: https://qat.redports.org/buildarchive/r352096/
 
 Log:
   - Add DOCS and EXAMPLES options.
   - Convert to USES=libtool.
   - Remove some remnants from older versions:
   - Don't set an so-version for libmnogosearch-3.4.so.  It's not needed
     and libmnogocharset-3.4.so doesn't have one either.
   - Use new LIB_DEPENDS syntax.
   - Replace NOPORTDOCS with PORT_OPTIONS.
   - Replace STRIP_CMD with INSTALL_TARGET=install-strip.
   - Don't cat pkg-message in post-install.
   - Remove pkg-install script.
   
   PR:		ports/188975
   Approved by:	crees (maintainer)
 
 Deleted:
   head/www/mnogosearch/pkg-install
 Modified:
   head/www/mnogosearch/Makefile
   head/www/mnogosearch/pkg-plist
 
 Modified: head/www/mnogosearch/Makefile
 ==============================================================================
 --- head/www/mnogosearch/Makefile	Fri Apr 25 07:42:39 2014	(r352095)
 +++ head/www/mnogosearch/Makefile	Fri Apr 25 08:13:41 2014	(r352096)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	mnogosearch
  PORTVERSION=	3.4.0
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	www databases
  MASTER_SITES=	http://www.mnogosearch.org/Download/ \
  		http://www.bayofrum.net/dist/${PORTNAME}/
 @@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
  
  CONFLICTS=	dpsearch-[0-9]* udmsearch-[0-9]* mguesser-[0-9]*
  
 -OPTIONS_DEFINE=	THREADS SSL ASIAN SYSLOG
 +OPTIONS_DEFINE=	DOCS EXAMPLES THREADS SSL ASIAN SYSLOG
  
  OPTIONS_MULTI=	database
  OPTIONS_MULTI_database=	PGSQL MSQL MYSQL SQLITE2 SQLITE3
 @@ -28,19 +28,13 @@ SYSLOG_DESC=	Send logs to syslog
  SQLITE2_DESC=	Use SQLite 2.x
  SQLITE3_DESC=	Use SQLite 3.x
  
 -USES=		gmake
 +GNU_CONFIGURE=	yes
 +INSTALL_TARGET=	install-strip
 +USES=		gmake libtool
  USE_LDCONFIG=	yes
 -USE_GNOME=	lthack
 -USE_AUTOTOOLS=	libtool
 -CONFIGURE_ARGS+=--enable-shared \
 -		--sysconfdir=${ETCDIR} \
 +CONFIGURE_ARGS=	--sysconfdir=${ETCDIR} \
  		--localstatedir=/var/mnogosearch \
  		--datadir=${DATADIR}
 -CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}"
 -MAKE_ENV+=	MKDIRPROG="${MKDIR}"
 -
 -PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
 -SHLIB_VER=	1
  
  SUB_FILES+=	pkg-message
  
 @@ -52,10 +46,8 @@ USE_OPENSSL=	yes
  
  .if ${PORT_OPTIONS:MTHREADS}
  CONFIGURE_ARGS+=	--enable-pthreads
 -CONFIGURE_ENV+=	LIBS="-pthread"
  .else
  CONFIGURE_ARGS+=	--disable-pthreads
 -CFLAGS+=	-DCONSOLE
  .endif
  
  .if ${PORT_OPTIONS:MSSL}
 @@ -76,7 +68,7 @@ CONFIGURE_ARGS+=	--with-pgsql=${LOCALBAS
  .endif
  
  .if ${PORT_OPTIONS:MMSQL}
 -LIB_DEPENDS+=		msql.1:${PORTSDIR}/databases/msql
 +LIB_DEPENDS+=		libmsql.so:${PORTSDIR}/databases/msql
  CONFIGURE_ARGS+=	--with-msql=${LOCALBASE}
  .endif
  
 @@ -100,7 +92,7 @@ PORTDOCS=	ChangeLog INSTALL README.html
  PORTEXAMPLES=	README *.conf
  
  post-patch:
 -.if !defined (NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	@${REINPLACE_CMD} -e 's#$$(DESTDIR)$$(prefix)/doc#${DOCSDIR}#' \
  		${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in
  .else
 @@ -109,22 +101,12 @@ post-patch:
  		${WRKSRC}/Makefile.in
  .endif
  
 -pre-install:
 -	@${MKDIR} ${STAGEDIR}${DATADIR}
 -
  post-install:
 -.for l in charset search
 -	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmnogo$l-${PORTVERSION:R}.so
 -.endfor
 -	${LN} -sf libmnogosearch.so \
 -		${STAGEDIR}${PREFIX}/lib/libmnogosearch-${PORTVERSION:R}.so.${SHLIB_VER}
  	${MKDIR} ${STAGEDIR}${DOCSDIR}
  .for f in ${PORTDOCS:NREADME.html}
  	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
  .endfor
  	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
  	${INSTALL_DATA} ${WRKSRC}/doc/samples/* ${STAGEDIR}${EXAMPLESDIR}/
 -	@${ECHO}
 -	@${CAT} ${PKGMESSAGE}
  
  .include <bsd.port.mk>
 
 Modified: head/www/mnogosearch/pkg-plist
 ==============================================================================
 --- head/www/mnogosearch/pkg-plist	Fri Apr 25 07:42:39 2014	(r352095)
 +++ head/www/mnogosearch/pkg-plist	Fri Apr 25 08:13:41 2014	(r352096)
 @@ -72,12 +72,9 @@ include/udm_xmalloc.h
  include/udmsearch.h
  lib/libmnogocharset-3.4.so
  lib/libmnogocharset.a
 -lib/libmnogocharset.la
  lib/libmnogocharset.so
  lib/libmnogosearch-3.4.so
 -lib/libmnogosearch-3.4.so.%%SHLIB_VER%%
  lib/libmnogosearch.a
 -lib/libmnogosearch.la
  lib/libmnogosearch.so
  man/man1/indexer.1.gz
  man/man5/indexer.conf.5.gz
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: tijl 
State-Changed-When: Fri Apr 25 12:13:50 CEST 2014 
State-Changed-Why:  
Committed in r352096. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=188975 
>Unformatted:
