Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Oct 2013 22:29:46 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r331810 - in head: Mk/Uses archivers/lha archivers/lha-ac audio/mp3gain comms/vrflash converters/mpack emulators/vmw german/dtaus graphics/hobbes-icons-xpm irc/iroffer irc/iroffer-dinoe...
Message-ID:  <201310272229.r9RMTkd2060648@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dinoex
Date: Sun Oct 27 22:29:46 2013
New Revision: 331810
URL: http://svnweb.freebsd.org/changeset/ports/331810

Log:
  - use STAGEDIR
  - use OPTIONS_DEFINE

Added:
  head/Mk/Uses/manpages.mk   (contents, props changed)
  head/www/smb_auth/pkg-message   (contents, props changed)
Modified:
  head/archivers/lha-ac/Makefile
  head/archivers/lha/Makefile
  head/audio/mp3gain/Makefile
  head/comms/vrflash/Makefile
  head/converters/mpack/Makefile
  head/emulators/vmw/Makefile
  head/german/dtaus/Makefile
  head/graphics/hobbes-icons-xpm/Makefile
  head/irc/iroffer-dinoex/Makefile
  head/irc/iroffer-lamm/Makefile
  head/irc/iroffer/Makefile
  head/mail/noattach/Makefile
  head/mail/raysfilter/Makefile
  head/mail/ripmime/Makefile
  head/mail/sentinel/Makefile
  head/mail/sma/Makefile
  head/mail/vbsfilter/Makefile
  head/misc/estic/Makefile
  head/multimedia/replex/Makefile
  head/net-mgmt/bsnmp-jails/Makefile
  head/net-p2p/ed2k/Makefile
  head/net/sixxs-aiccu/Makefile
  head/net/tinyldap/Makefile
  head/news/pgpmoose/Makefile
  head/ports-mgmt/pkg_jail/Makefile
  head/security/pgp/Makefile
  head/security/pgpin/Makefile
  head/sysutils/dupmerge/Makefile
  head/sysutils/ua/Makefile
  head/sysutils/zidrav/Makefile
  head/textproc/agrep/Makefile
  head/www/smb_auth/Makefile
  head/www/tidy/Makefile

Added: head/Mk/Uses/manpages.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Mk/Uses/manpages.mk	Sun Oct 27 22:29:46 2013	(r331810)
@@ -0,0 +1,120 @@
+# $FreeBSD$
+#
+# Provide support for manpages
+#
+# MAINTAINER: dinoex@FreeBSD.org
+#
+# Feature:              manpages
+# Usage:                USES=manpages or USES=manpages:ARGS
+# Valid ARGS:           install
+#			will install the manpages from MANSRC
+#
+#
+# MAN<sect>     - A list of manpages, categorized by section.  For
+#                 example, if your port has "man/man1/foo.1" and
+#                 "man/mann/bar.n", set "MAN1=foo.1" and "MANN=bar.n".
+#                 The available sections chars are "123456789LN".
+# MAN<sect>_<lang>
+#               - If your port does not install all man pages for all
+#                 languages in MANLANG, language specific pages for
+#                 a language can be specified with this. For example,
+#                 if the port installs foo.1 in English, Japanese, and
+#                 German, bar.1 in English only, and baz.3 in German
+#                 only, set
+#                   MANLANG=    "" de ja
+#                   MAN1=       foo.1
+#                   MAN1_EN=    bar.1
+#                   MAN3_DE=    baz.3
+# MANPREFIX     - The directory prefix for ${MAN<sect>} and ${MLINKS}.
+#                 Default: ${PREFIX}
+# MAN<sect>PREFIX
+#               - If manual pages of some sections install in different
+#                 locations than others, use these.
+#                 Default: ${MANPREFIX}
+# MANSRC        - The directory where the manpages are copied from
+#                 during install.
+#                 Default: ${WRKSRC}
+#
+#
+# NO_INSTALL_MANPAGES
+#               - If set, this port doesn't want to install any manpages.
+#                 Default: not set, i.e. manpages are installed by default.
+#
+
+.if !defined(_INCLUDE_USES_MANPAGES_MK)
+_INCLUDE_USES_MANPAGES_MK=	yes
+
+MANSRC?=	${WRKSRC}
+#MANPREFIX?=	${PREFIX}
+#
+#MANDIRS+=	${MANPREFIX}/man
+#.for sect in 1 2 3 4 5 6 7 8 9 L N
+#MAN${sect}PREFIX?=	${MANPREFIX}
+#.endfor
+
+MANLANG?=	""  # english only by default
+
+#MANEXT=	.gz
+
+#.for manlang in ${MANLANG:S%^%man/%:S%^man/""$%man%}
+#
+#.for sect in 1 2 3 4 5 6 7 8 9 L N
+## MAN${sect} is for man pages installed for all languages in MANLANG for a given
+## section.
+#.if defined(MAN${sect})
+#_MANPAGES+=	${MAN${sect}:S%^%${MAN${sect}PREFIX}/${manlang}/man${sect:L}/%}
+#.endif
+#
+## Language specific MAN${sect} variables are for man pages installed in that
+## language, but not necessarily all languages in MANLANG.
+#.if defined(MAN${sect}_${manlang:S%^man/%%:U})
+#_MANPAGES+=	${MAN${sect}_${manlang:S%^man/%%:U}:S%^%${MAN${sect}PREFIX}/${manlang}/man${sect:L}/%}
+#.endif
+#
+#.endfor
+#
+#.endfor
+#
+## Special case for English, since it is defined with "" in MANLANG rather than
+## a language name and does not have man pages installed in a lang subdirectory 
+## of MAN${sect}PREFIX.
+#.for sect in 1 2 3 4 5 6 7 8 9 L N
+#.if defined(MAN${sect}_EN)
+#_MANPAGES+=	${MAN${sect}_EN:S%^%${MAN${sect}PREFIX}/man/man${sect:L}/%}
+#.endif
+#.endfor
+
+#__MANPAGES:=	${_MANPAGES:S%^${PREFIX}/%%:S%$%.gz%}
+
+.if !defined(NO_INSTALL_MANPAGES)
+PLIST_FILES+=	${__MANPAGES}
+.endif
+
+.if defined(manpages_ARGS)
+.if ${manpages_ARGS} == "install"
+
+install-all-manpages:
+
+.if !defined(NO_INSTALL_MANPAGES)
+.for manlang in ${MANLANG:S%^%man/%:S%^man/""$%man%}
+
+.for sect in 1 2 3 4 5 6 7 8 9 L N
+# MAN${sect} is for man pages installed for all languages in MANLANG for a given
+# section.
+.if defined(MAN${sect})
+.for i in ${MAN${sect}}
+	${INSTALL_MAN} ${MANSRC}/${i} \
+	${STAGEDIR}${MAN${sect}PREFIX}/${manlang}/man${sect:L}/
+.endfor
+.endif
+
+.endfor
+
+.endfor
+.endif
+
+.endif
+.endif
+
+.endif
+

Modified: head/archivers/lha-ac/Makefile
==============================================================================
--- head/archivers/lha-ac/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/archivers/lha-ac/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -13,16 +13,14 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-ac2
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Archive files using LZSS and Huffman compression (.lzh files)
 
-CONFLICTS=	lha-1*
-NO_STAGE=	yes
+RESTRICTED=	no permission to redistribute
 
-MAN1=		lha.1
-MANLANG=	ja
-PLIST_FILES=	bin/lha
-#PLIST_DIRS=	man/ja/man1
+#USES=		manpages
 GNU_CONFIGURE=	yes
-
-RESTRICTED=	no permission to redistribute
+PLIST_FILES=	bin/lha-ac
+MANLANG=	ja
+MAN1_JA=	lha-ac.1
+PLIST_FILES+=	${__MANPAGES}
 
 .include <bsd.port.options.mk>
 
@@ -33,8 +31,8 @@ CONFIGURE_ARGS+=	--enable-multibyte-file
 .endif
 
 do-install:
-	-${MKDIR} ${MANPREFIX}/man/ja/man1
-	${INSTALL_PROGRAM} ${WRKSRC}/src/lha ${PREFIX}/bin/lha
-	${INSTALL_MAN} ${WRKSRC}/man/lha.n ${MANPREFIX}/man/ja/man1/lha.1
+	-${MKDIR} ${STAGEDIR}${PREFIX}/man/ja/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/src/lha ${STAGEDIR}${PREFIX}/bin/lha-ac
+	${INSTALL_MAN} ${WRKSRC}/man/lha.n ${STAGEDIR}${PREFIX}/man/ja/man1/lha-ac.1
 
 .include <bsd.port.mk>

Modified: head/archivers/lha/Makefile
==============================================================================
--- head/archivers/lha/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/archivers/lha/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -11,11 +11,14 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/./
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Archive files using LZSS and Huffman compression (.lzh files)
 
-CONFLICTS=	lha-ac-1*
-NO_STAGE=	yes
-
-MAN1=		lha.1
 MANLANG=	ja
+MAN1=		lha.1
 PLIST_FILES=	bin/lha
+PLIST_FILES+=	${__MANPAGES}
+
+do-install:
+	-${MKDIR} ${STAGEDIR}${PREFIX}/man/ja/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/src/lha ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/man/lha.n ${STAGEDIR}${PREFIX}/man/ja/man1/lha.1
 
 .include <bsd.port.mk>

Modified: head/audio/mp3gain/Makefile
==============================================================================
--- head/audio/mp3gain/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/audio/mp3gain/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -12,7 +12,7 @@ COMMENT=	A tool to normalize the gain of
 
 LICENSE=	LGPL21
 
-NO_STAGE=	yes
+NEED_ROOT=	yes
 
 USE_ZIP=	yes
 USE_DOS2UNIX=	yes

Modified: head/comms/vrflash/Makefile
==============================================================================
--- head/comms/vrflash/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/comms/vrflash/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -11,18 +11,18 @@ COMMENT=	Flash kernels and romdisks to t
 
 LICENSE=	GPLv2
 
-NO_STAGE=	yes
-
 GNU_CONFIGURE=	yes
 DOCS=		agenda-flashing-overview.txt troubleshooting.txt \
 		pmon-protect-unprotect.txt usage.txt
 
+.include <bsd.port.options.mk>
+
 do-install:
-	${INSTALL_PROGRAM} -m 755 ${WRKSRC}/vrflash ${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/vrflash ${STAGEDIR}${PREFIX}/bin/
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
 

Modified: head/converters/mpack/Makefile
==============================================================================
--- head/converters/mpack/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/converters/mpack/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -13,9 +13,8 @@ COMMENT=	External MIME packer/unpacker
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 
-NO_STAGE=	yes
-
-MAN1=		mpack.1 munpack.1
+USES=		manpages
 PLIST_FILES=	bin/mpack bin/munpack
+MAN1=		mpack.1 munpack.1
 
 .include <bsd.port.mk>

Modified: head/emulators/vmw/Makefile
==============================================================================
--- head/emulators/vmw/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/emulators/vmw/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -9,14 +9,15 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	VM Back Command Line Tools for VMware
 
 ONLY_FOR_ARCHS=	i386
-NO_STAGE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 USES=		iconv
 
 SBINS=		vmw vmshrink vmftp
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	README-eucj.TXT README-sjis.TXT README.TXT
 .for i in ${SBINS}
 PORTDOCS+=	${i}-eucj.txt ${i}-sjis.txt ${i}.txt
@@ -28,11 +29,11 @@ PLIST_FILES+=	sbin/${i}
 
 do-install:
 .for i in ${SBINS}
-	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin/
 .endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/.. && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC}/.. && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>

Modified: head/german/dtaus/Makefile
==============================================================================
--- head/german/dtaus/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/german/dtaus/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -10,36 +10,34 @@ COMMENT=	Belegloser DatenTraegerAUStausc
 
 LICENSE=	GPLv2
 
-NO_STAGE=	yes
-
+USES=		manpages:install
 ALL_TARGET=	dtaus
 PLIST_FILES=	bin/dtaus
-
 PORTDOCS=	ChangeLog README TODO dtaus.txt
 PORTEXAMPLES=	dtaus.cls sample.ctl
 MAN1=		dtaus.1
 MAN5=		dtaus.5
 
+.include <bsd.port.options.mk>
+
 do-configure:
 	 ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \
 		${WRKSRC}/bigint.c ${WRKSRC}/dtaus.c
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dtaus ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/dtaus.1  ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/dtaus.5  ${PREFIX}/man/man5/
-.ifndef(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+do-install:	install-all-manpages
+	${INSTALL_PROGRAM} ${WRKSRC}/dtaus ${STAGEDIR}${PREFIX}/bin/
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} \
-		${DOCSDIR}/
+		${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for doc in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${doc} \
-		${EXAMPLESDIR}/
+		${STAGEDIR}${EXAMPLESDIR}/
 .endfor
 .endif
 

Modified: head/graphics/hobbes-icons-xpm/Makefile
==============================================================================
--- head/graphics/hobbes-icons-xpm/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/graphics/hobbes-icons-xpm/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -11,26 +11,25 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Collection of over 3000 icons in XPM3 format
 
-NO_STAGE=	yes
 NO_BUILD=	yes
+NEED_ROOT=	yes
 
-# Where it will be installed (change pkg/PLIST if you change this)
-LIBDIR=		${PREFIX}/include/X11/pixmaps
+LIBDIR=		${STAGEDIR}${PREFIX}/include/X11/pixmaps
 
 .include <bsd.port.options.mk>
 
 do-install:
 	${MKDIR} ${LIBDIR}
-	${CP} -R ${WRKSRC}/* ${LIBDIR}
+	${CP} -R ${WRKSRC}/* ${LIBDIR}/
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${LIBDIR}
 	-${RM} ${LIBDIR}/README
 	-${RM} ${LIBDIR}/readem.shar
 
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
-	${INSTALL_SCRIPT} ${WRKSRC}/*.shar ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/*.shar ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>

Modified: head/irc/iroffer-dinoex/Makefile
==============================================================================
--- head/irc/iroffer-dinoex/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/irc/iroffer-dinoex/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -14,15 +14,15 @@ COMMENT=	An IRC "bot" that makes sharing
 LICENSE=	GPLv2
 
 CONFLICTS=	iroffer-1* iroffer-lamm-1.*
-NO_STAGE=	yes
 
+USES=		manpages:install
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
-MAN1=		iroffer.1
-MAN7=		xdcc.7
 CONFIGURE_ARGS=	CC="${CC}" LDFLAGS="${LDFLAGS}" LOCALBASE="${LOCALBASE}"
 ALL_TARGET=	all-lang doc
 USE_RC_SUBR=	iroffer-dinoex
+MAN1=		iroffer.1
+MAN7=		xdcc.7
 
 IROFFER_DOCS=	README README.modDinoex LIESMICH.modDinoex \
 		LICENSE THANKS TODO \
@@ -61,32 +61,31 @@ CONFIGURE_ARGS+=	-upnp
 .endif
 .if ${PORT_OPTIONS:MRUBY}
 USE_RUBY=	yes
+USE_LIBRUBY=	yes
 CONFIGURE_ARGS+=	-ruby
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
 .endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-de ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-it ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-fr ${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+do-install:	install-all-manpages
+	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-de ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-it ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-fr ${STAGEDIR}${PREFIX}/bin/
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${IROFFER_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}/htdocs
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/htdocs
 .for i in ${IROFFER_HTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/htdocs/${i} ${EXAMPLESDIR}/htdocs/
+	${INSTALL_DATA} ${WRKSRC}/htdocs/${i} ${STAGEDIR}${EXAMPLESDIR}/htdocs/
 .endfor
 .for i in ${IROFFER_EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
 .endif
-	${INSTALL_MAN} ${WRKSRC}/iroffer.1 ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/xdcc.7 ${PREFIX}/man/man7/
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/irc/iroffer-lamm/Makefile
==============================================================================
--- head/irc/iroffer-lamm/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/irc/iroffer-lamm/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -14,28 +14,29 @@ COMMENT=	An IRC "bot" that makes sharing
 LICENSE=	GPLv2
 
 CONFLICTS=	iroffer-1.* iroffer-dinoex-3.*
-NO_STAGE=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	${REINPLACE_CMD} -e 's|cctype="gcc"|cctype="${CC}"|' \
 		${WRKSRC}/Configure
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/convertxdccfile ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${DOCSDIR}/
+	${INSTALL_PROGRAM} ${WRKSRC}/convertxdccfile ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${STAGEDIR}${PREFIX}/bin/
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${STAGEDIR}${DOCSDIR}/
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/dynip.sh ${EXAMPLESDIR}/
-	${INSTALL_DATA} ${WRKSRC}/iroffer.cron ${EXAMPLESDIR}/
-	${INSTALL_DATA} ${WRKSRC}/sample.config ${EXAMPLESDIR}/
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/dynip.sh ${STAGEDIR}${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/iroffer.cron ${STAGEDIR}${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/sample.config ${STAGEDIR}${EXAMPLESDIR}/
 .endif
 	@${CAT} ${PKGMESSAGE}
 

Modified: head/irc/iroffer/Makefile
==============================================================================
--- head/irc/iroffer/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/irc/iroffer/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -14,28 +14,29 @@ COMMENT=	An IRC "bot" that makes sharing
 LICENSE=	GPLv2
 
 CONFLICTS=	iroffer-lamm-1.* iroffer-dinoex-3.*
-NO_STAGE=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	${REINPLACE_CMD} -e 's|cctype="gcc"|cctype="${CC}"|' \
 		${WRKSRC}/Configure
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/convertxdccfile ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${DOCSDIR}/
+	${INSTALL_PROGRAM} ${WRKSRC}/convertxdccfile ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${STAGEDIR}${PREFIX}/bin/
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${STAGEDIR}${DOCSDIR}/
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/dynip.sh ${EXAMPLESDIR}/
-	${INSTALL_DATA} ${WRKSRC}/iroffer.cron ${EXAMPLESDIR}/
-	${INSTALL_DATA} ${WRKSRC}/sample.config ${EXAMPLESDIR}/
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/dynip.sh ${STAGEDIR}${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/iroffer.cron ${STAGEDIR}${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/sample.config ${STAGEDIR}${EXAMPLESDIR}/
 .endif
 	@${CAT} ${PKGMESSAGE}
 

Modified: head/mail/noattach/Makefile
==============================================================================
--- head/mail/noattach/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/mail/noattach/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -9,18 +9,13 @@ MASTER_SITES=	ftp://ftp.rhnet.is/pub/noa
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An attachment filter for Sendmail Milter
 
+USES=		manpages:install
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=    noattach
-
-NO_STAGE=	yes
-
 CFLAGS+=	${PTHREAD_CFLAGS:S=""==}
-MAN8=		noattach.8
 DOCSFILES=	AUTHORS THANKS INSTALL NEWS README TODO ChangeLog
 SAMPLEFILES=	README noattach.patterns noattach.patterns.johncon
-.if defined(SENDMAIL_WITH_LDAP)
-CONFIGURE_ARGS+=	--enable-ldap
-.endif
+MAN8=		noattach.8
 
 .include <bsd.port.pre.mk>
 
@@ -35,21 +30,20 @@ pre-configure:
 	${REINPLACE_CMD} -e 's=-pthread=${PTHREAD_LIBS}=' \
 		${WRKSRC}/configure
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/noattach ${PREFIX}/libexec/noattach
+do-install:	install-all-manpages
+	${INSTALL_PROGRAM} ${WRKSRC}/noattach ${STAGEDIR}${PREFIX}/libexec/noattach
 	${INSTALL_DATA} ${WRKSRC}/examples/noattach.patterns \
-		 ${PREFIX}/etc/noattach.patterns-dist
-	${INSTALL_MAN} ${WRKSRC}/noattach.8 ${PREFIX}/man/man8/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+		 ${STAGEDIR}${PREFIX}/etc/noattach.patterns-dist
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCSFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in ${SAMPLEFILES}
-	${INSTALL_DATA} ${WRKSRC}/examples/${i} ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/examples/${i} ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
 .endif
 

Modified: head/mail/raysfilter/Makefile
==============================================================================
--- head/mail/raysfilter/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/mail/raysfilter/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -10,8 +10,6 @@ DISTNAME=	rays-filter-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A configurable filter for Sendmail Milter
 
-NO_STAGE=	yes
-
 CTARGETS+=	rays-filter
 CFLAGS+=	-Wall ${PTHREAD_CFLAGS:S=""==}
 LIBS+=		${PTHREAD_LIBS}
@@ -46,20 +44,20 @@ do-build:	${CTARGETS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rays-filter \
-		${PREFIX}/libexec/rays-filter
+		${STAGEDIR}${PREFIX}/libexec/rays-filter
 	${INSTALL_SCRIPT} ${WRKSRC}/mail-filter \
-		${PREFIX}/etc/rc.d/raysfilter.sh.sample
+		${STAGEDIR}${PREFIX}/etc/rc.d/raysfilter.sh.sample
 .for i in ${BINFILES}
-	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin/
 .endfor
-	${MKDIR} ${PREFIX}/etc/mail-filter
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail-filter
 .for i in ${ETCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/etc/mail-filter/${i}-dist
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/etc/mail-filter/${i}-dist
 .endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCSFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
 

Modified: head/mail/ripmime/Makefile
==============================================================================
--- head/mail/ripmime/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/mail/ripmime/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -12,8 +12,8 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Extracts attached files out of a MIME encoded email package
 
 MAKE_JOBS_UNSAFE=	yes
-NO_STAGE=	yes
 
+USES=		manpages:install
 PLIST_FILES=	bin/ripmime
 MAN1=		ripmime.1
 
@@ -23,9 +23,8 @@ pre-build:
 		${WRKSRC}/Makefile ${WRKSRC}/ripOLE/Makefile \
 		${WRKSRC}/tnef/Makefile
 
-do_install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ripmime ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/ripmime.1 ${MANPREFIX}/man/man1/
+do-install:	install-all-manpages
+	${INSTALL_PROGRAM} ${WRKSRC}/ripmime ${STAGEDIR}${PREFIX}/bin/
 
 post-install:
 	@${CAT} ${PKGMESSAGE}

Modified: head/mail/sentinel/Makefile
==============================================================================
--- head/mail/sentinel/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/mail/sentinel/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -12,7 +12,7 @@ COMMENT=	A sendmail milter API implement
 
 LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
-NO_STAGE=	yes
+NEED_ROOT=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -32,15 +32,15 @@ do-build:
 		-lmilter -lpcre -lpcreposix ${PTHREAD_LIBS}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sentinel ${PREFIX}/sbin
-	@${MKDIR} /var/spool/sentinel
-	${CHOWN} smmsp:smmsp /var/spool/sentinel
-	${INSTALL_DATA} ${FILESDIR}/000.sentinel.sh ${PREFIX}/etc/rc.d/sentinel.sh-dist
-	${INSTALL_DATA} ${WRKSRC}/sentinel.cf.SAMPLE ${PREFIX}/etc/sentinel.cf.dist
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.FreeBSD ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/sentinel ${STAGEDIR}${PREFIX}/sbin/
+	@${MKDIR} ${STAGEDIR}/var/spool/sentinel
+	${CHOWN} smmsp:smmsp ${STAGEDIR}/var/spool/sentinel
+	${INSTALL_DATA} ${FILESDIR}/000.sentinel.sh ${STAGEDIR}${PREFIX}/etc/rc.d/sentinel.sh-dist
+	${INSTALL_DATA} ${WRKSRC}/sentinel.cf.SAMPLE ${STAGEDIR}${PREFIX}/etc/sentinel.cf.dist
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.FreeBSD ${STAGEDIR}${DOCSDIR}
 .endif
 
 post-install:

Modified: head/mail/sma/Makefile
==============================================================================
--- head/mail/sma/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/mail/sma/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -10,32 +10,31 @@ MASTER_SITE_SUBDIR=	dinoex
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Program that analyses Sendmail log entries
 
-NO_STAGE=	yes
-
-MAN8=		sma.8
-DOCSFILES=	BUGS COPYRIGHT HISTORY README TODO
-SAMPLEFILES=	sma.conf
+USES=		manpages:install
 ALL_TARGET=	sma
+SAMPLEFILES=	sma.conf
+DOCSFILES=	BUGS COPYRIGHT HISTORY README TODO
+MAN8=		sma.8
+
+.include <bsd.port.options.mk>
 
 do-configure:
-	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.sed
-	${SED} -e "s,CC	=,CC?=	," \
+	${REINPLACE_CMD} -e "s,CC	=,CC?=	," \
 		-e "s,CFLAGS	= -Wall -O,CFLAGS+=	," \
-		${WRKSRC}/Makefile.sed > ${WRKSRC}/Makefile
+		${WRKSRC}/Makefile
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sma ${PREFIX}/bin/sma
-	${INSTALL_MAN} ${WRKSRC}/sma.8 ${PREFIX}/man/man8/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+do-install:	install-all-manpages
+	${INSTALL_PROGRAM} ${WRKSRC}/sma ${STAGEDIR}${PREFIX}/bin/sma
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCSFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in ${SAMPLEFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
 .endif
 

Modified: head/mail/vbsfilter/Makefile
==============================================================================
--- head/mail/vbsfilter/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/mail/vbsfilter/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -46,6 +46,6 @@ do-build:	${CTARGETS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vbsfilter-${PORTVERSION} \
-		${PREFIX}/libexec/vbsfilter
+		${STAGEDIR}${PREFIX}/libexec/vbsfilter
 
 .include <bsd.port.post.mk>

Modified: head/misc/estic/Makefile
==============================================================================
--- head/misc/estic/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/misc/estic/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -13,8 +13,6 @@ DISTFILES=		estic-1.60-sources.zip estic
 MAINTAINER=		dinoex@FreeBSD.org
 COMMENT=		Controller for ISDN TK-Anlage (PBX) made by Istec
 
-NO_STAGE=	yes
-
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 
@@ -32,11 +30,11 @@ PLIST_SUB+=	WITH_X=""
 AUTHOR=		"Ullrich von Bassewitz" <uz@ibb.schwaben.com>
 
 # Personal Preferences, Where to install.
-PBX_VAR=${PREFIX}/var/log/pbx
-PBX_ETC=${PREFIX}/etc/pbx
-PBX_MAN=${MANPREFIX}/man/man1
-PBX_BIN=${PREFIX}/bin
-PBX_DOC=${DOCSDIR}
+PBX_VAR=${STAGEDIR}${PREFIX}/var/log/pbx
+PBX_ETC=${STAGEDIR}${PREFIX}/etc/pbx
+PBX_MAN=${STAGEDIR}${MANPREFIX}/man/man1
+PBX_BIN=${STAGEDIR}${PREFIX}/bin
+PBX_DOC=${STAGEDIR}${DOCSDIR}
 ESTIC=${WRKSRC}/estic
 AREACODE_DATAFILE=${PREFIX}/etc/pbx/areacodes
 
@@ -70,10 +68,10 @@ do-install:
 .if !defined(NOPORTDOCS)
 	@# estic doc says estic.res must be in bin path or current directory
 	@${MKDIR} ${PBX_DOC}
-	${INSTALL_MAN} ${ESTIC}/estic.doc ${PBX_DOC}
+	${INSTALL_MAN} ${ESTIC}/estic.doc ${PBX_DOC}/
 	@# estic.doc is not nroff format, & is in German, volunteers to create
 	@# _and maintain_ nroff formatted English should contact ${AUTHOR}
-	${INSTALL_MAN} ${FILESDIR}/README ${PBX_DOC}
+	${INSTALL_MAN} ${FILESDIR}/README ${PBX_DOC}/
 .endif
 	@# ${FILESDIR}/README is not in nroff, but is a temporary document.
 	@${MKDIR} ${PBX_ETC} ${PBX_VAR}

Modified: head/multimedia/replex/Makefile
==============================================================================
--- head/multimedia/replex/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/multimedia/replex/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -10,15 +10,14 @@ MASTER_SITE_SUBDIR=dinoex
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Remultiplex an MPEG2 TS into a PS for DVD
 
-NO_STAGE=	yes
-
 USE_GMAKE=	yes
-MAKE_ARGS=	CFLAGS="${CFLAGS}" DEFINES="${CPPFLAGS} -DO_LARGEFILE=0 -DVERSION=\\\"$(PORTVERSION)\\\"" \
-		LIBS="${LDFLAGS}"
-
+MAKE_ARGS=	CFLAGS="${CFLAGS}" DEFINES="${CPPFLAGS} -DO_LARGEFILE=0 \
+		-DVERSION=\\\"$(PORTVERSION)\\\"" LIBS="${LDFLAGS}"
 PLIST_FILES=	bin/replex
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	CHANGES README TODO
 .endif
 
@@ -29,12 +28,12 @@ post-patch:
 		's|-L. -lreplex|libreplex.a $${LIBS}|g' ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/replex ${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}/
+	${INSTALL_PROGRAM} ${WRKSRC}/replex ${STAGEDIR}${PREFIX}/bin/
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/bsnmp-jails/Makefile
==============================================================================
--- head/net-mgmt/bsnmp-jails/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/net-mgmt/bsnmp-jails/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -11,15 +11,13 @@ COMMENT=	A bsnmpd module to measure stat
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-NO_STAGE=	yes
-
+USES=		manpages
 GNU_CONFIGURE=	yes
 
-MAN8=		bsnmp-jails.8
-
 PLIST_FILES=	lib/snmp_jails.so lib/snmp_jails.so.0 \
 		lib/snmp_jails.a lib/snmp_jails.la \
 		libexec/jail-measure
+MAN8=		bsnmp-jails.8
 
 post-patch:
 	${REINPLACE_CMD} -e 's|freebsd1|freebsd1.|' \

Modified: head/net-p2p/ed2k/Makefile
==============================================================================
--- head/net-p2p/ed2k/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/net-p2p/ed2k/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -13,20 +13,25 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Calculates 'eMule' hashes or producing ed2k:// file links
 
 CONFLICTS=	amule-*
-NO_STAGE=	yes
 
 NO_WRKSUBDIR=	yes
 MAKEFILE=	/dev/null
 ALL_TARGET=	ed2k
 PLIST_FILES=	bin/ed2k
 
-.if defined(WITHOUT_OPENSSL)
-OPENSSLSUFFIX=	-rsa
-CFLAGS+=	-DWITH_RSA
-.else
+OPTIONS_DEFINE=	OPENSSL
+OPTIONS_DEFAULT=OPENSSL
+OPENSSL_DESC=	use faster hash libs from OpenSSL
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPENSSL}
 OPENSSLSUFFIX=	-openssl
 USE_OPENSSL=	yes
 LDLIBS+=	-lmd
+.else
+OPENSSLSUFFIX=	-rsa
+CFLAGS+=	-DWITH_RSA
 .endif
 
 MAKE_ARGS+=	CFLAGS="${CFLAGS}"
@@ -36,6 +41,6 @@ post-extract:
 	${CP} -p ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC}/
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ed2k ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/ed2k ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>

Modified: head/net/sixxs-aiccu/Makefile
==============================================================================
--- head/net/sixxs-aiccu/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/net/sixxs-aiccu/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -17,8 +17,6 @@ LIB_DEPENDS=	gnutls-openssl:${PORTSDIR}/
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
-NO_STAGE=	yes
-
 USE_RC_SUBR=	sixxs-aiccu
 USE_GMAKE=	yes
 
@@ -29,6 +27,9 @@ WRKSRC=		${WRKDIR}/aiccu
 BUILD_WRKSRC=	${WRKDIR}/aiccu/unix-console
 PORTDOCS=	README
 
+OPTIONS_DEFINE=	LOG_DAEMON
+LOG_DAEMON_DESC=	log to LOG_DAEMON instead to LOG_LOCAL7
+
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's:verbose true:verbose false:' \
@@ -39,9 +40,9 @@ post-patch:
 		-e 's:ipv6_interface sixxs:ipv6_interface gif0:' \
 		${WRKSRC}/doc/aiccu.conf
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_LOG_DAEMON)
+.if ${PORT_OPTIONS:MLOG_DAEMON}
 do-configure:
 	@${REINPLACE_CMD} \
 		-e 's:LOG_LOCAL7:LOG_DAEMON:' \
@@ -49,14 +50,11 @@ do-configure:
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/unix-console/aiccu ${PREFIX}/sbin/sixxs-aiccu
-.ifndef(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/README ${DOCSDIR}
-.endif
-	${INSTALL_DATA} ${WRKSRC}/doc/aiccu.conf ${PREFIX}/etc/aiccu.conf.sample
-.if !exists(${PREFIX}/etc/aiccu.conf)
-	${INSTALL_DATA} -m 0644 ${WRKSRC}/doc/aiccu.conf ${PREFIX}/etc/aiccu.conf
+	${INSTALL_PROGRAM} ${WRKSRC}/unix-console/aiccu ${STAGEDIR}${PREFIX}/sbin/sixxs-aiccu
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/README ${STAGEDIR}${DOCSDIR}/
 .endif
+	${INSTALL_DATA} ${WRKSRC}/doc/aiccu.conf ${STAGEDIR}${PREFIX}/etc/aiccu.conf.sample
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/tinyldap/Makefile
==============================================================================
--- head/net/tinyldap/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/net/tinyldap/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -14,15 +14,11 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libowfa
 
 LICENSE=	GPLv2
 
-NO_STAGE=	yes
-
 SNAPSHOT=	20091122
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 CFLAGS+=	-DATTRIBS=512
-LIBOWFAT_PORT?=	devel/libowfat
-TINYLDAP_DATA?=	${PREFIX}/tinyldap/data
 SBINFILES=	acl addindex bindrequest dumpacls dumpidx idx2ldif parse \
 		tinyldap_debug tinyldap_standalone
 BINFILES=	ldapclient ldapclient_str md5password mysql2ldif \
@@ -30,24 +26,29 @@ BINFILES=	ldapclient ldapclient_str md5p
 DOCFILES=	ACL FORMAT GETTING.STARTED README README.security RFCs \
 		THANKS TODO
 
+LIBOWFAT_PORT?=	devel/libowfat
+TINYLDAP_DATA?=	${PREFIX}/tinyldap/data
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	${TOUCH} ${WRKSRC}/alloca.h
 	${REINPLACE_CMD} -e "s|\"data\"|\"${TINYLDAP_DATA}\"|" \
 		${WRKSRC}/tinyldap.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tinyldap ${PREFIX}/libexec/
+	${INSTALL_PROGRAM} ${WRKSRC}/tinyldap ${STAGEDIR}${PREFIX}/libexec/
 	${CP} -p ${WRKSRC}/ldapdelete ${WRKSRC}/tinyldapdelete
 .for i in ${BINFILES}
-	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 .for i in ${SBINFILES}
-	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin/
 .endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
 

Modified: head/news/pgpmoose/Makefile
==============================================================================
--- head/news/pgpmoose/Makefile	Sun Oct 27 22:20:43 2013	(r331809)
+++ head/news/pgpmoose/Makefile	Sun Oct 27 22:29:46 2013	(r331810)
@@ -14,26 +14,22 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	PGP Moose - signatures for moderated newsgroups
 
-NO_STAGE=	yes
-
-MAN1=		pmapp.1 pmcanon.1 pmcheck.1 pmnewsgroups.1 \
-		pmdaemon.1 pmcancel.1
+USES=		manpages:install
+NO_WRKSUBDIR=	yes
 BIN1=		pmapp pmcanon pmcheck pmnewsgroups \
 		pmdaemon pmcancel
+MAN1=		pmapp.1 pmcanon.1 pmcheck.1 pmnewsgroups.1 \
+		pmdaemon.1 pmcancel.1
 
-NO_WRKSUBDIR=	yes
 NEWSCTL?=	${PREFIX}/news/lib
 
 post-patch:
 	${REINPLACE_CMD} -e "s=/usr/local/news=${NEWSCTL}=" \
 		${WRKSRC}/pmapp
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



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