From pi@zfs.opsec.eu  Tue Dec 11 20:44:30 2012
Return-Path: <pi@zfs.opsec.eu>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 58FCC664
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Dec 2012 20:44:30 +0000 (UTC)
	(envelope-from pi@zfs.opsec.eu)
Received: from zfs.opsec.eu (zfs.opsec.eu [IPv6:2001:14f8:200:4::18])
	by mx1.freebsd.org (Postfix) with ESMTP id 1030F8FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 11 Dec 2012 20:44:29 +0000 (UTC)
Received: from pi by zfs.opsec.eu with local (Exim 4.80.1 (FreeBSD))
	(envelope-from <pi@zfs.opsec.eu>)
	id 1TiWgp-0003i2-Jm; Tue, 11 Dec 2012 21:44:31 +0100
Message-Id: <E1TiWgp-0003i2-Jm@zfs.opsec.eu>
Date: Tue, 11 Dec 2012 21:44:31 +0100
From: Kurt Jaeger <fbsd-ports@opsec.eu>
Reply-To: Kurt Jaeger <fbsd-ports@opsec.eu>
To: FreeBSD-gnats-submit@freebsd.org
Cc: kurt.lidl@cello.com
Subject: [patch update] fix makefile options databases/freetds-devel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         174377
>Category:       ports
>Synopsis:       [patch update] fix makefile options databases/freetds-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 11 20:50:01 UTC 2012
>Closed-Date:    Wed Dec 12 08:11:52 UTC 2012
>Last-Modified:  Wed Dec 12 08:11:52 UTC 2012
>Originator:     Kurt Jaeger
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
-
>Environment:
System: FreeBSD zfs.opsec.eu 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64


>Description:

make config always fails

No matter what you select, it complains:

====> You must select one and only one option from the ODBC single
====> You must select one and only one option from the SSL single
Config is invalid. Re-edit? [Y/N] n

>How-To-Repeat:
	make config
>Fix:

The include for bsd.port.options.mk was at the wrong location.
Thanks to Kurt Lidl for pointing this out. 

diff -r -u databases/freetds-devel/Makefile /usr/home/pi/myp/databases/freetds-devel/Makefile
--- databases/freetds-devel/Makefile	2012-11-30 23:24:39.304139424 +0100
+++ /usr/home/pi/myp/databases/freetds-devel/Makefile	2012-12-11 21:40:53.850573224 +0100
@@ -29,27 +29,23 @@
 		defncopy.1 fisql.1 osql.1
 MAN5=		freetds.conf.5
 
-.include <bsd.port.options.mk>
-
-# OPTIONS_DEFINE=	OPENSSL GNUTLS IODBC UNIXODBC MSDBLIB
-OPTIONS_DEFINE=	MSDBLIB
+OPTIONS_DEFINE=		OPENSSL GNUTLS IODBC UNIXODBC MSDBLIB
+OPTIONS_SET=		IODBC OPENSSL MSDBLIB
 
-OPTIONS_SINGLE=	ODBC SSL
+OPTIONS_SINGLE=		ODBC SSL
 OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
 OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
 
-OPTIONS_DEFAULT=	OPENSSL IODBC
-
 OPENSSL_DESC=	Use OpenSSL
 GNUTLS_DESC=	Use GnuTLS
 IODBC_DESC=	Depend on iodbc
 UNIXODBC_DESC=	Depend on unixodbc
 MSDBLIB_DESC=	MS SQL Server compatibility (breaks databases/sybtcl)
 
-CONFLICTS=	freetds-0.64.[0-9]
-
 .include <bsd.port.options.mk>
 
+CONFLICTS=	freetds-0.64.[0-9]
+
 .if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
@@ -83,6 +79,8 @@
 TDS_VER=	7.2
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 	@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist
 	@cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.dist
@@ -109,4 +107,4 @@
 	@${ECHO_CMD} "Sample configuration files have been installed in ${PREFIX}/etc"
 	@${ECHO_CMD} "You should edit them and remove the .dist-suffix from their names"
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:

From: Kurt Jaeger <pi@opsec.eu>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/174377: [patch update] fix makefile options
 databases/freetds-devel
Date: Tue, 11 Dec 2012 21:55:09 +0100

 Hi!
 
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=174377
 
 Sorry, here's the updated patch:
 
 diff -r -u databases/freetds-devel/Makefile /usr/home/pi/myp/databases/freetds-devel/Makefile
 --- databases/freetds-devel/Makefile	2012-11-30 23:24:39.304139424 +0100
 +++ /usr/home/pi/myp/databases/freetds-devel/Makefile	2012-12-11 21:47:21.340991629 +0100
 @@ -29,27 +29,24 @@
  		defncopy.1 fisql.1 osql.1
  MAN5=		freetds.conf.5
  
 -.include <bsd.port.options.mk>
 -
 -# OPTIONS_DEFINE=	OPENSSL GNUTLS IODBC UNIXODBC MSDBLIB
 -OPTIONS_DEFINE=	MSDBLIB
 +#OPTIONS_DEFINE=		OPENSSL GNUTLS IODBC UNIXODBC MSDBLIB
 +OPTIONS_DEFINE=		MSDBLIB
 +OPTIONS_SET=		IODBC OPENSSL MSDBLIB
  
 -OPTIONS_SINGLE=	ODBC SSL
 +OPTIONS_SINGLE=		ODBC SSL
  OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
  OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
  
 -OPTIONS_DEFAULT=	OPENSSL IODBC
 -
  OPENSSL_DESC=	Use OpenSSL
  GNUTLS_DESC=	Use GnuTLS
  IODBC_DESC=	Depend on iodbc
  UNIXODBC_DESC=	Depend on unixodbc
  MSDBLIB_DESC=	MS SQL Server compatibility (breaks databases/sybtcl)
  
 -CONFLICTS=	freetds-0.64.[0-9]
 -
  .include <bsd.port.options.mk>
  
 +CONFLICTS=	freetds-0.64.[0-9]
 +
  .if ${PORT_OPTIONS:MOPENSSL}
  USE_OPENSSL=	yes
  CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 @@ -83,6 +80,8 @@
  TDS_VER=	7.2
  .endif
  
 +.include <bsd.port.pre.mk>
 +
  post-extract:
  	@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist
  	@cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.dist
 @@ -109,4 +108,4 @@
  	@${ECHO_CMD} "Sample configuration files have been installed in ${PREFIX}/etc"
  	@${ECHO_CMD} "You should edit them and remove the .dist-suffix from their names"
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 
 -- 
 pi@opsec.eu            +49 171 3101372                         8 years to go !
State-Changed-From-To: open->closed 
State-Changed-By: bapt 
State-Changed-When: Wed Dec 12 08:11:51 UTC 2012 
State-Changed-Why:  
A fix as already been committed. Thanks! 

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