Bug 172378

	Change the Makefile for new options structure

Fix: 

update Makefile with the following patch:


48,60c48,66
< OPTIONS=	APOP_ONLY	"build with APOP authentication only" off \
< 		APOP		"build with APOP" on \
< 		DOCUMENTATION	"install pdf documentation" off \
< 		DRAC		"build with Dynamic Relay Authorization" off \
< 		FULL_POPD_DEBUG	"build with more verbose debugging" off \
< 		PAM		"build with PAM authentication" off \
< 		POPPASSD	"build the poppassd daemon" off \
< 		QPOPAUTH_SETUID	"install qpopauth setuid to pop user" on \
< 		SAMPLE_POPUSERS	"build a default reject file" off \
< 		SHY_ENABLED	"hide qpopper version in POP3 banner" off \
< 		SSL		"build with SSL/TLS support" on \
< 		STANDALONE_MODE	"build qpopper to be run without inetd" off \
< 		U_OPTION	"include support for user .qpopper-options" on
---
> OPTIONS_DEFINE=	APOP_ONLY APOP DOCUMENTATION DRAC FULL_POPD_DEBUG PAM \
> 		POPPASSD QPOPAUTH_SETUID SAMPLE_POPUSERS SHY_ENABLED \
> 		SSL STANDALONE_MODE U_OPTION
> 
> APOP_ONLY_DESC=		build with APOP authentication only
> APOP_DESC=		build with APOP
> DOCUMENTATION_DESC=	install pdf documentation
> DRAC_DESC=		build with Dynamic Relay Authorization
> FULL_POPD_DEBUG_DESC=	build with more verbose debugging
> PAM_DESC=		build with PAM authentication
> POPPASSD_DESC=		build the poppassd daemon
> QPOPAUTH_SETUID_DESC=	install qpopauth setuid to pop user
> SAMPLE_POPUSERS_DESC=	build a default reject file
> SHY_ENABLED_DESC=	hide qpopper version in POP3 banner
> SSL_DESC=		build with SSL/TLS support
> STANDALONE_MODE_DESC=	build qpopper to be run without inetd
> U_OPTION_DESC=		include support for user .qpopper-options
> 
> OPTIONS_DEFAULT=	APOP QPOPAUTH_SETUID SSL U_OPTION
64c70
< .if defined(WITHOUT_APOP)
---
> .if empty(PORT_OPTIONS:MAPOP)
73c79
< .if defined(WITH_APOP_ONLY)
---
> .if ${PORT_OPTIONS:MAPOP_ONLY}
80c86
< .if !defined(WITH_DOCUMENTATION)
---
> .if empty(PORT_OPTIONS:MDOCUMENTATION)
86c92
< .if defined(WITH_DRAC)
---
> .if ${PORT_OPTIONS:MDRAC}
93c99
< .if defined(WITH_FULL_POPD_DEBUG)
---
> .if ${PORT_OPTIONS:MFULL_POPD_DEBUG}
98c104
< .if defined(WITH_PAM)
---
> .if ${PORT_OPTIONS:MPAM}
104c110
< .if defined(WITH_POPPASSD)
---
> .if ${PORT_OPTIONS:MPOPPASSD}
115c121
< .if defined(WITH_SHY_ENABLED)
---
> .if ${PORT_OPTIONS:MSHY_ENABLED}
121c127
< .if defined(WITH_STANDALONE_MODE)
---
> .if ${PORT_OPTIONS:MSTANDALONE_MODE}
127c133
< .if !defined(WITHOUT_SSL)
---
> .if ${PORT_OPTIONS:MSSL}
How-To-Repeat: 	make