Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Oct 2013 05:17:38 -0500
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        Dirk Meyer <dinoex@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: 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:  <526E39C2.2000806@FreeBSD.org>
In-Reply-To: <201310272229.r9RMTkd2060648@svn.freebsd.org>
References:  <201310272229.r9RMTkd2060648@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--XX2gMbrPb2mDFwPLNFFqALQ3UiNqNW9Ii
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On 10/27/2013 5:29 PM, Dirk Meyer wrote:
> Author: dinoex
> Date: Sun Oct 27 22:29:46 2013
> New Revision: 331810
> URL: http://svnweb.freebsd.org/changeset/ports/331810
>=20
> Log:
>   - use STAGEDIR
>   - use OPTIONS_DEFINE
>=20
> 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
>=20
> Added: head/Mk/Uses/manpages.mk
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- /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=3Dmanpages or USES=3Dmanpages:ARGS
> +# Valid ARGS:           install

Can you please revert this? This is not correct at all. portmgr has
decided that manpages should be in the plist; you should not
unilaterally decide to re-add a macro for it again.

> +#			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=3Dfoo.1" and "MANN=3Dbar=
=2En".
> +#                 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=3D    "" de ja
> +#                   MAN1=3D       foo.1
> +#                   MAN1_EN=3D    bar.1
> +#                   MAN3_DE=3D    baz.3
> +# MANPREFIX     - The directory prefix for ${MAN<sect>} and ${MLINKS}.=

> +#                 Default: ${PREFIX}
> +# MAN<sect>PREFIX
> +#               - If manual pages of some sections install in differen=
t
> +#                 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 manpag=
es.
> +#                 Default: not set, i.e. manpages are installed by def=
ault.
> +#
> +
> +.if !defined(_INCLUDE_USES_MANPAGES_MK)
> +_INCLUDE_USES_MANPAGES_MK=3D	yes
> +
> +MANSRC?=3D	${WRKSRC}
> +#MANPREFIX?=3D	${PREFIX}
> +#
> +#MANDIRS+=3D	${MANPREFIX}/man
> +#.for sect in 1 2 3 4 5 6 7 8 9 L N
> +#MAN${sect}PREFIX?=3D	${MANPREFIX}
> +#.endfor
> +
> +MANLANG?=3D	""  # english only by default
> +
> +#MANEXT=3D	.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+=3D	${MAN${sect}:S%^%${MAN${sect}PREFIX}/${manlang}/man${se=
ct: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+=3D	${MAN${sect}_${manlang:S%^man/%%:U}:S%^%${MAN${sect}PRE=
FIX}/${manlang}/man${sect:L}/%}
> +#.endif
> +#
> +#.endfor
> +#
> +#.endfor
> +#
> +## Special case for English, since it is defined with "" in MANLANG ra=
ther than
> +## a language name and does not have man pages installed in a lang sub=
directory=20
> +## of MAN${sect}PREFIX.
> +#.for sect in 1 2 3 4 5 6 7 8 9 L N
> +#.if defined(MAN${sect}_EN)
> +#_MANPAGES+=3D	${MAN${sect}_EN:S%^%${MAN${sect}PREFIX}/man/man${sect:L=
}/%}
> +#.endif
> +#.endfor
> +
> +#__MANPAGES:=3D	${_MANPAGES:S%^${PREFIX}/%%:S%$%.gz%}
> +
> +.if !defined(NO_INSTALL_MANPAGES)
> +PLIST_FILES+=3D	${__MANPAGES}
> +.endif
> +
> +.if defined(manpages_ARGS)
> +.if ${manpages_ARGS} =3D=3D "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 f=
or 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
> +
>=20
> Modified: head/archivers/lha-ac/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	${PORTNAME}-${PORTVERSION}-ac2
>  MAINTAINER=3D	dinoex@FreeBSD.org
>  COMMENT=3D	Archive files using LZSS and Huffman compression (.lzh file=
s)
> =20
> -CONFLICTS=3D	lha-1*
> -NO_STAGE=3D	yes
> +RESTRICTED=3D	no permission to redistribute
> =20
> -MAN1=3D		lha.1
> -MANLANG=3D	ja
> -PLIST_FILES=3D	bin/lha
> -#PLIST_DIRS=3D	man/ja/man1
> +#USES=3D		manpages
>  GNU_CONFIGURE=3D	yes
> -
> -RESTRICTED=3D	no permission to redistribute
> +PLIST_FILES=3D	bin/lha-ac
> +MANLANG=3D	ja
> +MAN1_JA=3D	lha-ac.1
> +PLIST_FILES+=3D	${__MANPAGES}
> =20
>  .include <bsd.port.options.mk>
> =20
> @@ -33,8 +31,8 @@ CONFIGURE_ARGS+=3D	--enable-multibyte-file
>  .endif
> =20
>  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/l=
ha-ac.1
> =20
>  .include <bsd.port.mk>
>=20
> Modified: head/archivers/lha/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	${PORTNAME}-${PORTVERSION:S/./
>  MAINTAINER=3D	dinoex@FreeBSD.org
>  COMMENT=3D	Archive files using LZSS and Huffman compression (.lzh file=
s)
> =20
> -CONFLICTS=3D	lha-ac-1*
> -NO_STAGE=3D	yes
> -
> -MAN1=3D		lha.1
>  MANLANG=3D	ja
> +MAN1=3D		lha.1
>  PLIST_FILES=3D	bin/lha
> +PLIST_FILES+=3D	${__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/l=
ha.1
> =20
>  .include <bsd.port.mk>
>=20
> Modified: head/audio/mp3gain/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	A tool to normalize the gain of
> =20
>  LICENSE=3D	LGPL21
> =20
> -NO_STAGE=3D	yes
> +NEED_ROOT=3D	yes
> =20
>  USE_ZIP=3D	yes
>  USE_DOS2UNIX=3D	yes
>=20
> Modified: head/comms/vrflash/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	Flash kernels and romdisks to t
> =20
>  LICENSE=3D	GPLv2
> =20
> -NO_STAGE=3D	yes
> -
>  GNU_CONFIGURE=3D	yes
>  DOCS=3D		agenda-flashing-overview.txt troubleshooting.txt \
>  		pmon-protect-unprotect.txt usage.txt
> =20
> +.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
> =20
>=20
> Modified: head/converters/mpack/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	External MIME packer/unpacker
>  WRKSRC=3D		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>  GNU_CONFIGURE=3D	yes
> =20
> -NO_STAGE=3D	yes
> -
> -MAN1=3D		mpack.1 munpack.1
> +USES=3D		manpages
>  PLIST_FILES=3D	bin/mpack bin/munpack
> +MAN1=3D		mpack.1 munpack.1
> =20
>  .include <bsd.port.mk>
>=20
> Modified: head/emulators/vmw/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	dinoex@FreeBSD.org
>  COMMENT=3D	VM Back Command Line Tools for VMware
> =20
>  ONLY_FOR_ARCHS=3D	i386
> -NO_STAGE=3D	yes
> =20
>  WRKSRC=3D		${WRKDIR}/${PORTNAME}/src
>  USES=3D		iconv
> =20
>  SBINS=3D		vmw vmshrink vmftp
> =20
> -.if !defined(NOPORTDOCS)
> +.include <bsd.port.options.mk>
> +
> +.if ${PORT_OPTIONS:MDOCS}
>  PORTDOCS=3D	README-eucj.TXT README-sjis.TXT README.TXT
>  .for i in ${SBINS}
>  PORTDOCS+=3D	${i}-eucj.txt ${i}-sjis.txt ${i}.txt
> @@ -28,11 +29,11 @@ PLIST_FILES+=3D	sbin/${i}
> =20
>  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
> =20
>  .include <bsd.port.mk>
>=20
> Modified: head/german/dtaus/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	Belegloser DatenTraegerAUStausc
> =20
>  LICENSE=3D	GPLv2
> =20
> -NO_STAGE=3D	yes
> -
> +USES=3D		manpages:install
>  ALL_TARGET=3D	dtaus
>  PLIST_FILES=3D	bin/dtaus
> -
>  PORTDOCS=3D	ChangeLog README TODO dtaus.txt
>  PORTEXAMPLES=3D	dtaus.cls sample.ctl
>  MAN1=3D		dtaus.1
>  MAN5=3D		dtaus.5
> =20
> +.include <bsd.port.options.mk>
> +
>  do-configure:
>  	 ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \
>  		${WRKSRC}/bigint.c ${WRKSRC}/dtaus.c
> =20
> -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
> =20
>=20
> Modified: head/graphics/hobbes-icons-xpm/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/graphics/hobbes-icons-xpm/Makefile	Sun Oct 27 22:20:43 2013	(r=
331809)
> +++ head/graphics/hobbes-icons-xpm/Makefile	Sun Oct 27 22:29:46 2013	(r=
331810)
> @@ -11,26 +11,25 @@ DISTNAME=3D	${PORTNAME}
>  MAINTAINER=3D	dinoex@FreeBSD.org
>  COMMENT=3D	Collection of over 3000 icons in XPM3 format
> =20
> -NO_STAGE=3D	yes
>  NO_BUILD=3D	yes
> +NEED_ROOT=3D	yes
> =20
> -# Where it will be installed (change pkg/PLIST if you change this)
> -LIBDIR=3D		${PREFIX}/include/X11/pixmaps
> +LIBDIR=3D		${STAGEDIR}${PREFIX}/include/X11/pixmaps
> =20
>  .include <bsd.port.options.mk>
> =20
>  do-install:
>  	${MKDIR} ${LIBDIR}
> -	${CP} -R ${WRKSRC}/* ${LIBDIR}
> +	${CP} -R ${WRKSRC}/* ${LIBDIR}/
>  	${CHOWN} -R ${BINOWN}:${BINGRP} ${LIBDIR}
>  	-${RM} ${LIBDIR}/README
>  	-${RM} ${LIBDIR}/readem.shar
> =20
>  .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
> =20
>  .include <bsd.port.mk>
>=20
> Modified: head/irc/iroffer-dinoex/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	An IRC "bot" that makes sharing
>  LICENSE=3D	GPLv2
> =20
>  CONFLICTS=3D	iroffer-1* iroffer-lamm-1.*
> -NO_STAGE=3D	yes
> =20
> +USES=3D		manpages:install
>  HAS_CONFIGURE=3D	yes
>  CONFIGURE_SCRIPT=3D	Configure
> -MAN1=3D		iroffer.1
> -MAN7=3D		xdcc.7
>  CONFIGURE_ARGS=3D	CC=3D"${CC}" LDFLAGS=3D"${LDFLAGS}" LOCALBASE=3D"${L=
OCALBASE}"
>  ALL_TARGET=3D	all-lang doc
>  USE_RC_SUBR=3D	iroffer-dinoex
> +MAN1=3D		iroffer.1
> +MAN7=3D		xdcc.7
> =20
>  IROFFER_DOCS=3D	README README.modDinoex LIESMICH.modDinoex \
>  		LICENSE THANKS TODO \
> @@ -61,32 +61,31 @@ CONFIGURE_ARGS+=3D	-upnp
>  .endif
>  .if ${PORT_OPTIONS:MRUBY}
>  USE_RUBY=3D	yes
> +USE_LIBRUBY=3D	yes
>  CONFIGURE_ARGS+=3D	-ruby
>  .include "${PORTSDIR}/Mk/bsd.ruby.mk"
>  .endif
> =20
> -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}/htdoc=
s/
>  .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}
> =20
>  .include <bsd.port.mk>
>=20
> Modified: head/irc/iroffer-lamm/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	An IRC "bot" that makes sharing
>  LICENSE=3D	GPLv2
> =20
>  CONFLICTS=3D	iroffer-1.* iroffer-dinoex-3.*
> -NO_STAGE=3D	yes
> =20
>  HAS_CONFIGURE=3D	yes
>  CONFIGURE_SCRIPT=3D	Configure
> =20
> +.include <bsd.port.options.mk>
> +
>  post-patch:
>  	${REINPLACE_CMD} -e 's|cctype=3D"gcc"|cctype=3D"${CC}"|' \
>  		${WRKSRC}/Configure
> =20
>  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}
> =20
>=20
> Modified: head/irc/iroffer/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	An IRC "bot" that makes sharing
>  LICENSE=3D	GPLv2
> =20
>  CONFLICTS=3D	iroffer-lamm-1.* iroffer-dinoex-3.*
> -NO_STAGE=3D	yes
> =20
>  HAS_CONFIGURE=3D	yes
>  CONFIGURE_SCRIPT=3D	Configure
> =20
> +.include <bsd.port.options.mk>
> +
>  post-patch:
>  	${REINPLACE_CMD} -e 's|cctype=3D"gcc"|cctype=3D"${CC}"|' \
>  		${WRKSRC}/Configure
> =20
>  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}
> =20
>=20
> Modified: head/mail/noattach/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	ftp://ftp.rhnet.is/pub/noa
>  MAINTAINER=3D	dinoex@FreeBSD.org
>  COMMENT=3D	An attachment filter for Sendmail Milter
> =20
> +USES=3D		manpages:install
>  GNU_CONFIGURE=3D	yes
>  USE_RC_SUBR=3D    noattach
> -
> -NO_STAGE=3D	yes
> -
>  CFLAGS+=3D	${PTHREAD_CFLAGS:S=3D""=3D=3D}
> -MAN8=3D		noattach.8
>  DOCSFILES=3D	AUTHORS THANKS INSTALL NEWS README TODO ChangeLog
>  SAMPLEFILES=3D	README noattach.patterns noattach.patterns.johncon
> -.if defined(SENDMAIL_WITH_LDAP)
> -CONFIGURE_ARGS+=3D	--enable-ldap
> -.endif
> +MAN8=3D		noattach.8
> =20
>  .include <bsd.port.pre.mk>
> =20
> @@ -35,21 +30,20 @@ pre-configure:
>  	${REINPLACE_CMD} -e 's=3D-pthread=3D${PTHREAD_LIBS}=3D' \
>  		${WRKSRC}/configure
> =20
> -do-install:
> -	${INSTALL_PROGRAM} ${WRKSRC}/noattach ${PREFIX}/libexec/noattach
> +do-install:	install-all-manpages
> +	${INSTALL_PROGRAM} ${WRKSRC}/noattach ${STAGEDIR}${PREFIX}/libexec/no=
attach
>  	${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
> =20
>=20
> Modified: head/mail/raysfilter/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	rays-filter-${PORTVERSION}
>  MAINTAINER=3D	dinoex@FreeBSD.org
>  COMMENT=3D	A configurable filter for Sendmail Milter
> =20
> -NO_STAGE=3D	yes
> -
>  CTARGETS+=3D	rays-filter
>  CFLAGS+=3D	-Wall ${PTHREAD_CFLAGS:S=3D""=3D=3D}
>  LIBS+=3D		${PTHREAD_LIBS}
> @@ -46,20 +44,20 @@ do-build:	${CTARGETS}
> =20
>  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
> =20
>=20
> Modified: head/mail/ripmime/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	dinoex@FreeBSD.org
>  COMMENT=3D	Extracts attached files out of a MIME encoded email package=

> =20
>  MAKE_JOBS_UNSAFE=3D	yes
> -NO_STAGE=3D	yes
> =20
> +USES=3D		manpages:install
>  PLIST_FILES=3D	bin/ripmime
>  MAN1=3D		ripmime.1
> =20
> @@ -23,9 +23,8 @@ pre-build:
>  		${WRKSRC}/Makefile ${WRKSRC}/ripOLE/Makefile \
>  		${WRKSRC}/tnef/Makefile
> =20
> -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/
> =20
>  post-install:
>  	@${CAT} ${PKGMESSAGE}
>=20
> Modified: head/mail/sentinel/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	A sendmail milter API implement
> =20
>  LIB_DEPENDS=3D	pcre:${PORTSDIR}/devel/pcre
> =20
> -NO_STAGE=3D	yes
> +NEED_ROOT=3D	yes
> =20
>  CFLAGS+=3D	-I${LOCALBASE}/include
>  LDFLAGS+=3D	-L${LOCALBASE}/lib
> @@ -32,15 +32,15 @@ do-build:
>  		-lmilter -lpcre -lpcreposix ${PTHREAD_LIBS}
> =20
>  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/sentin=
el.sh-dist
> -	${INSTALL_DATA} ${WRKSRC}/sentinel.cf.SAMPLE ${PREFIX}/etc/sentinel.c=
f.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
> =20
>  post-install:
>=20
> Modified: head/mail/sma/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	dinoex
>  MAINTAINER=3D	dinoex@FreeBSD.org
>  COMMENT=3D	Program that analyses Sendmail log entries
> =20
> -NO_STAGE=3D	yes
> -
> -MAN8=3D		sma.8
> -DOCSFILES=3D	BUGS COPYRIGHT HISTORY README TODO
> -SAMPLEFILES=3D	sma.conf
> +USES=3D		manpages:install
>  ALL_TARGET=3D	sma
> +SAMPLEFILES=3D	sma.conf
> +DOCSFILES=3D	BUGS COPYRIGHT HISTORY README TODO
> +MAN8=3D		sma.8
> +
> +.include <bsd.port.options.mk>
> =20
>  do-configure:
> -	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.sed
> -	${SED} -e "s,CC	=3D,CC?=3D	," \
> +	${REINPLACE_CMD} -e "s,CC	=3D,CC?=3D	," \
>  		-e "s,CFLAGS	=3D -Wall -O,CFLAGS+=3D	," \
> -		${WRKSRC}/Makefile.sed > ${WRKSRC}/Makefile
> +		${WRKSRC}/Makefile
> =20
> -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
> =20
>=20
> Modified: head/mail/vbsfilter/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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}
> =20
>  do-install:
>  	${INSTALL_PROGRAM} ${WRKSRC}/vbsfilter-${PORTVERSION} \
> -		${PREFIX}/libexec/vbsfilter
> +		${STAGEDIR}${PREFIX}/libexec/vbsfilter
> =20
>  .include <bsd.port.post.mk>
>=20
> Modified: head/misc/estic/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D		estic-1.60-sources.zip estic
>  MAINTAINER=3D		dinoex@FreeBSD.org
>  COMMENT=3D		Controller for ISDN TK-Anlage (PBX) made by Istec
> =20
> -NO_STAGE=3D	yes
> -
>  USE_ZIP=3D	yes
>  NO_WRKSUBDIR=3D	yes
> =20
> @@ -32,11 +30,11 @@ PLIST_SUB+=3D	WITH_X=3D""
>  AUTHOR=3D		"Ullrich von Bassewitz" <uz@ibb.schwaben.com>
> =20
>  # Personal Preferences, Where to install.
> -PBX_VAR=3D${PREFIX}/var/log/pbx
> -PBX_ETC=3D${PREFIX}/etc/pbx
> -PBX_MAN=3D${MANPREFIX}/man/man1
> -PBX_BIN=3D${PREFIX}/bin
> -PBX_DOC=3D${DOCSDIR}
> +PBX_VAR=3D${STAGEDIR}${PREFIX}/var/log/pbx
> +PBX_ETC=3D${STAGEDIR}${PREFIX}/etc/pbx
> +PBX_MAN=3D${STAGEDIR}${MANPREFIX}/man/man1
> +PBX_BIN=3D${STAGEDIR}${PREFIX}/bin
> +PBX_DOC=3D${STAGEDIR}${DOCSDIR}
>  ESTIC=3D${WRKSRC}/estic
>  AREACODE_DATAFILE=3D${PREFIX}/etc/pbx/areacodes
> =20
> @@ -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 creat=
e
>  	@# _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}
>=20
> Modified: head/multimedia/replex/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3Ddinoex
>  MAINTAINER=3D	dinoex@FreeBSD.org
>  COMMENT=3D	Remultiplex an MPEG2 TS into a PS for DVD
> =20
> -NO_STAGE=3D	yes
> -
>  USE_GMAKE=3D	yes
> -MAKE_ARGS=3D	CFLAGS=3D"${CFLAGS}" DEFINES=3D"${CPPFLAGS} -DO_LARGEFILE=
=3D0 -DVERSION=3D\\\"$(PORTVERSION)\\\"" \
> -		LIBS=3D"${LDFLAGS}"
> -
> +MAKE_ARGS=3D	CFLAGS=3D"${CFLAGS}" DEFINES=3D"${CPPFLAGS} -DO_LARGEFILE=
=3D0 \
> +		-DVERSION=3D\\\"$(PORTVERSION)\\\"" LIBS=3D"${LDFLAGS}"
>  PLIST_FILES=3D	bin/replex
> =20
> -.if !defined(NOPORTDOCS)
> +.include <bsd.port.options.mk>
> +
> +.if ${PORT_OPTIONS:MDOCS}
>  PORTDOCS=3D	CHANGES README TODO
>  .endif
> =20
> @@ -29,12 +28,12 @@ post-patch:
>  		's|-L. -lreplex|libreplex.a $${LIBS}|g' ${WRKSRC}/Makefile
> =20
>  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
> =20
>  .include <bsd.port.mk>
>=20
> Modified: head/net-mgmt/bsnmp-jails/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/bsnmp-jails/Makefile	Sun Oct 27 22:20:43 2013	(r33180=
9)
> +++ head/net-mgmt/bsnmp-jails/Makefile	Sun Oct 27 22:29:46 2013	(r33181=
0)
> @@ -11,15 +11,13 @@ COMMENT=3D	A bsnmpd module to measure stat
>  LICENSE=3D	BSD
>  LICENSE_FILE=3D	${WRKSRC}/COPYING
> =20
> -NO_STAGE=3D	yes
> -
> +USES=3D		manpages
>  GNU_CONFIGURE=3D	yes
> =20
> -MAN8=3D		bsnmp-jails.8
> -
>  PLIST_FILES=3D	lib/snmp_jails.so lib/snmp_jails.so.0 \
>  		lib/snmp_jails.a lib/snmp_jails.la \
>  		libexec/jail-measure
> +MAN8=3D		bsnmp-jails.8
> =20
>  post-patch:
>  	${REINPLACE_CMD} -e 's|freebsd1|freebsd1.|' \
>=20
> Modified: head/net-p2p/ed2k/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	dinoex@FreeBSD.org
>  COMMENT=3D	Calculates 'eMule' hashes or producing ed2k:// file links
> =20
>  CONFLICTS=3D	amule-*
> -NO_STAGE=3D	yes
> =20
>  NO_WRKSUBDIR=3D	yes
>  MAKEFILE=3D	/dev/null
>  ALL_TARGET=3D	ed2k
>  PLIST_FILES=3D	bin/ed2k
> =20
> -.if defined(WITHOUT_OPENSSL)
> -OPENSSLSUFFIX=3D	-rsa
> -CFLAGS+=3D	-DWITH_RSA
> -.else
> +OPTIONS_DEFINE=3D	OPENSSL
> +OPTIONS_DEFAULT=3DOPENSSL
> +OPENSSL_DESC=3D	use faster hash libs from OpenSSL
> +
> +.include <bsd.port.options.mk>
> +
> +.if ${PORT_OPTIONS:MOPENSSL}
>  OPENSSLSUFFIX=3D	-openssl
>  USE_OPENSSL=3D	yes
>  LDLIBS+=3D	-lmd
> +.else
> +OPENSSLSUFFIX=3D	-rsa
> +CFLAGS+=3D	-DWITH_RSA
>  .endif
> =20
>  MAKE_ARGS+=3D	CFLAGS=3D"${CFLAGS}"
> @@ -36,6 +41,6 @@ post-extract:
>  	${CP} -p ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC}/
> =20
>  do-install:
> -	${INSTALL_PROGRAM} ${WRKSRC}/ed2k ${PREFIX}/bin/
> +	${INSTALL_PROGRAM} ${WRKSRC}/ed2k ${STAGEDIR}${PREFIX}/bin/
> =20
>  .include <bsd.port.mk>
>=20
> Modified: head/net/sixxs-aiccu/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	gnutls-openssl:${PORTSDIR}/
>  LICENSE=3D	BSD
>  LICENSE_FILE=3D	${WRKSRC}/doc/LICENSE
> =20
> -NO_STAGE=3D	yes
> -
>  USE_RC_SUBR=3D	sixxs-aiccu
>  USE_GMAKE=3D	yes
> =20
> @@ -29,6 +27,9 @@ WRKSRC=3D		${WRKDIR}/aiccu
>  BUILD_WRKSRC=3D	${WRKDIR}/aiccu/unix-console
>  PORTDOCS=3D	README
> =20
> +OPTIONS_DEFINE=3D	LOG_DAEMON
> +LOG_DAEMON_DESC=3D	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
> =20
> -.include <bsd.port.pre.mk>
> +.include <bsd.port.options.mk>
> =20
> -.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
> =20
>  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.sam=
ple
> -.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/aic=
cu.conf.sample
> =20
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
>=20
> Modified: head/net/tinyldap/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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+=3D	${LOCALBASE}/lib/libowfa
> =20
>  LICENSE=3D	GPLv2
> =20
> -NO_STAGE=3D	yes
> -
>  SNAPSHOT=3D	20091122
>  USE_BZIP2=3D	yes
>  USE_GMAKE=3D	yes
>  WRKSRC=3D		${WRKDIR}/${PORTNAME}
>  CFLAGS+=3D	-DATTRIBS=3D512
> -LIBOWFAT_PORT?=3D	devel/libowfat
> -TINYLDAP_DATA?=3D	${PREFIX}/tinyldap/data
>  SBINFILES=3D	acl addindex bindrequest dumpacls dumpidx idx2ldif parse =
\
>  		tinyldap_debug tinyldap_standalone
>  BINFILES=3D	ldapclient ldapclient_str md5password mysql2ldif \
> @@ -30,24 +26,29 @@ BINFILES=3D	ldapclient ldapclient_str md5p
>  DOCFILES=3D	ACL FORMAT GETTING.STARTED README README.security RFCs \
>  		THANKS TODO
> =20
> +LIBOWFAT_PORT?=3D	devel/libowfat
> +TINYLDAP_DATA?=3D	${PREFIX}/tinyldap/data
> +
> +.include <bsd.port.options.mk>
> +
>  post-patch:
>  	${TOUCH} ${WRKSRC}/alloca.h
>  	${REINPLACE_CMD} -e "s|\"data\"|\"${TINYLDAP_DATA}\"|" \
>  		${WRKSRC}/tinyldap.c
> =20
>  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
> =20
>=20
> Modified: head/news/pgpmoose/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	.tar.Z
>  MAINTAINER=3D	dinoex@FreeBSD.org
>  COMMENT=3D	PGP Moose - signatures for moderated newsgroups
> =20
> -NO_STAGE=3D	yes
> -
> -MAN1=3D		pmapp.1 pmcanon.1 pmcheck.1 pmnewsgroups.1 \
> -		pmdaemon.1 pmcancel.1
> +USES=3D		manpages:install
> +NO_WRKSUBDIR=3D	yes
>  BIN1=3D		pmapp pmcanon pmcheck pmnewsgroups \
>  		pmdaemon pmcancel
> +MAN1=3D		pmapp.1 pmcanon.1 pmcheck.1 pmnewsgroups.1 \
> +		pmdaemon.1 pmcancel.1
> =20
> -NO_WRKSUBDIR=3D	yes
>  NEWSCTL?=3D	${PREFIX}/news/lib
> =20
>  post-patch:
>  	${REINPLACE_CMD} -e "s=3D/usr/local/news=3D${NEWSCTL}=3D" \
>  		${WRKSRC}/pmapp
> =20
>=20
> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
>=20


--=20
Regards,
Bryan Drewery


--XX2gMbrPb2mDFwPLNFFqALQ3UiNqNW9Ii
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJSbjnCAAoJEG54KsA8mwz5mncP/iee4OcacW0sP8iMldvKmT1D
/fja5PaHn+Jtqayd8XaWWv9N9jV2mqwJchsPskiiTzf8wiXN+NzxnanZSrRGtEZe
daUhst2VmBWG59pFbVg2AzPVqp5oYRIVfSOKMt8tGIv1Mj6aV6qW5bbUQVgODM0K
SI1N9S1+cdetEX4GpcXuuv3f+PLPNuu7tFavtNROy+d+zVB5rntuPJWEvt17S2Ra
6BEVTG2zCnnXNRQctoUFUMS7yhKXKIuTHJ0QcPO1YwIFpgp3vG6yVfITIwDR2GEa
1RpcUuR8xe8at19IkmpNXBdHI9+0sQMBcEy7BLuNMmtwfq+URODwrwmnNBa4D/WE
hdcsOvjr/JatBgxoXVPfYjGMplxfm8inn/VdJ4yNDTNRMeK/A/Dltgb2NtyKh4Oj
DXv/AmSfc3RG7fGMgFmLH5l6ztzC5DKpsx5XDdFjsKB54TUJrBeUMu0nchodHF2U
5GbdETryD+amud9Va7G99GDAT1qOxh9WbXYE9jiNsd7C+rZozzztoxfqai6yXeJW
2Lggihi7I2EY8LtnrD8uxVBUdN5aGLzBm9J8LhEVX+KuLXIE6cXyr8HBvwYBBpkD
V/Dwm+Vlj3WzzNyxxw1sJKLATUHEHmuqHDi2pVN2ZiS/xBj+hdeop1HSGEb+Ig36
8YgVN3hNsRzuGxrz/a33
=ElhG
-----END PGP SIGNATURE-----

--XX2gMbrPb2mDFwPLNFFqALQ3UiNqNW9Ii--



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