- Convert to new options framework

- Add shared MAGICK, MYSQL, PGSQL and SQLITE descriptions

Reviewed by:	bapt

Mk/bsd.options.desc.mk

@@ -11,14 +11,18 @@ DOCS_DESC?=		Build and install the documentation
 FLAC_DESC?=		Enable support for flac
 ID3_DESC?=		Enable support for id3 tags
 LDAP_DESC?=		Enable LDAP support
+MAGICK_DESC?=		Enable ImageMagick Library
 MMKEYS_DESC?=		Enable multimedia keys support
 MP4_DESC?=		Enable support for mp4
 MULTIBYTE_DESC?=	Enable multibyte character support
+MYSQL_DESC?=		Enable MySQL backend
 NLS_DESC?=		Build and install the localisation data
 PCRE_DESC?=		Enable regular expressions using libpcre
+PGSQL_DESC?=		Enable PostgreSQL backend
 PNG_DESC?=		Enable PNG support
 SSL_DESC?=		Enable SSL support
 STATIC_DESC?=		Build static executable/libraries
+SQLITE_DESC?=		Enable SQLite backend
 TIDY_DESC?=		Enable tidy html cleaner support
 VORBIS_DESC?=		Enable support for ogg vorbis
 XSPF_DESC?=		Enable support for XSPF

www/serendipity/Makefile

@@ -24,26 +24,24 @@ SUB_LIST+=	SERENDIPITY=${SERENDIPITY}
 SUB_FILES=	pkg-message
 USE_BZIP2=	YES
 
-OPTIONS=	MYSQL "Use MySQL backend" on \
-		PGSQL "Use PostgreSQL backend" off \
-		SQLITE "Use SQLite backend (php5 only)" off \
-		MAGICK "Use ImageMagick Library" on
+OPTIONS_DEFINE= MYSQL PGSQL SQLITE MAGICK
+OPTIONS_DEFAULT= MYSQL MAGICK
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_PHP+=	mysql
 . endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_PHP+=	sqlite
 .endif
 
-.if !defined(WITHOUT_MAGICK)
+.if ${PORT_OPTIONS:MMAGICK}
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .endif
 
@@ -56,4 +54,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>