Skip site navigation (1)Skip section navigation (2)
Date:      7 Oct 2012 04:15:31 -0000
From:      Michael Gmelin <freebsd@grem.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/172426: [PATCH] security/libpreludedb: Converting port to new options framework
Message-ID:  <20121007041531.60493.qmail@mail.grem.de>
Resent-Message-ID: <201210070420.q974KHtm064199@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         172426
>Category:       ports
>Synopsis:       [PATCH] security/libpreludedb: Converting port to new options framework
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 07 04:20:17 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Michael Gmelin
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
Grem Equity GmbH
>Environment:
System: FreeBSD bsd64.grem.de 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:
The patch below converts the port to use the new options framework[1]
and converts the Makefile header to the new format[2].

The patch is to be applied using:

patch -p0 -E </path/to/patchfile

No attempts have been made to fix any potential issues the port might
have beyond this scope. I also didn't fix any indentation issues to
keep the patch small and easy to audit, a future port maintainer might
want to take care of this.

See also:
1. http://lists.freebsd.org/pipermail/freebsd-ports/2012-October/078676.html
2. http://lists.freebsd.org/pipermail/freebsd-ports/2012-August/077801.html


Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix)
>How-To-Repeat:
>Fix:

--- libpreludedb-0.9.15.3_1.patch begins here ---
diff -ruN --exclude=CVS ../libpreludedb.orig/Makefile ./Makefile
--- ../libpreludedb.orig/Makefile	2012-10-07 05:01:05.615983731 +0200
+++ ./Makefile	2012-10-07 05:13:36.966743954 +0200
@@ -1,7 +1,5 @@
-# New ports collection makefile for:	libpreludedb
-# Date created:			2005-10-14
-# Whom:				Sergei Kolobov <sergei@FreeBSD.org>
-# $FreeBSD: ports/security/libpreludedb/Makefile,v 1.39 2011/08/02 16:22:13 bapt Exp $
+# Created by: Sergei Kolobov <sergei@FreeBSD.org>
+# $FreeBSD: $
 
 PORTNAME=	libpreludedb
 PORTVERSION=	0.9.15.3
@@ -23,15 +21,17 @@
 MAN1=		preludedb-admin.1
 PORTDOCS=	*
 
-OPTIONS=	PERL "Include Perl bindings" off \
-		PYTHON "Include Python bindings" off \
-		MYSQL "Use MySQL backend" on \
-		PGSQL "Use PostgreSQL backend" off \
-		SQLITE "Use SQLite backend" off
+OPTIONS_DEFINE=	DOCS MYSQL PERL PGSQL PYTHON SQLITE
+OPTIONS_DEFAULT=MYSQL
+PERL_DESC=	Include Perl bindings
+PYTHON_DESC=	Include Python bindings
+MYSQL_DESC=	Use MySQL backend
+PGSQL_DESC=	Use PostgreSQL backend
+SQLITE_DESC=	Use SQLite backend
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 USE_PERL5=		yes
 CONFIGURE_ARGS+=	--with-perl
 PLIST_SUB+=		WITH_PERL=""
@@ -40,7 +40,7 @@
 PLIST_SUB+=		WITH_PERL="@comment "
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 CONFIGURE_ARGS+=	--with-python
@@ -50,7 +50,7 @@
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
-.if defined(WITH_MYSQL) || exists(${LOCALBASE}/bin/mysql_config)
+.if ${PORT_OPTIONS:MMYSQL} || exists(${LOCALBASE}/bin/mysql_config)
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql
 PLIST_SUB+=		WITH_MYSQL=""
@@ -59,7 +59,7 @@
 PLIST_SUB+=		WITH_MYSQL="@comment "
 .endif
 
-.if defined(WITH_PGSQL) || exists(${LOCALBASE}/bin/pg_config)
+.if ${PORT_OPTIONS:MPGSQL} || exists(${LOCALBASE}/bin/pg_config)
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgresql
 PLIST_SUB+=		WITH_PGSQL=""
@@ -68,7 +68,7 @@
 PLIST_SUB+=		WITH_PGSQL="@comment "
 .endif
 
-.if defined(WITH_SQLITE) || exists(${LOCALBASE}/lib/libsqlite3.so)
+.if ${PORT_OPTIONS:MSQLITE} || exists(${LOCALBASE}/lib/libsqlite3.so)
 USE_SQLITE=		yes
 CONFIGURE_ARGS+=	--with-sqlite3
 PLIST_SUB+=		WITH_SQLITE=""
@@ -83,11 +83,11 @@
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${DOCSDIR}
 .endif
 
 	@${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- libpreludedb-0.9.15.3_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121007041531.60493.qmail>