svn commit: r316620 - in head: audio/soundtracker comms/fldigi comms/hylafax databases/postgresql84-server databases/postgresql91-server databases/postgresql92-server deskutils/xneur devel/geany-pl...

[Chris Rees]

On 26 April 2013 16:10, Baptiste Daroussin <bapt at freebsd.org> wrote:
> Author: bapt
> Date: Fri Apr 26 15:10:57 2013
> New Revision: 316620
> URL: http://svnweb.freebsd.org/changeset/ports/316620
>
> Log:
>   Convert USE_GETTEXT -> USES=gettext
>
>   While here:
>   - Trim headers
>   - Remove some useless pre.mk/post.mk
>   - Convert to optionsng
>
> Modified:
>   head/audio/soundtracker/Makefile
>   head/comms/fldigi/Makefile
>   head/comms/hylafax/Makefile
>   head/databases/postgresql84-server/Makefile
>   head/databases/postgresql91-server/Makefile
>   head/databases/postgresql92-server/Makefile
>   head/deskutils/xneur/Makefile
>   head/devel/geany-plugins/files/Makefile.common
>   head/devel/gvfs/Makefile
>   head/devel/kdesvn-kde4/Makefile
>   head/devel/monotone/Makefile
>   head/devel/pikdev/Makefile
>   head/devel/rhtvision/Makefile
>   head/devel/ruby-gettext/Makefile
>   head/devel/subversion/Makefile.common
>   head/devel/subversion16/Makefile
>   head/devel/subversion16/Makefile.common
>   head/devel/urjtag/Makefile
>   head/devel/yasm/Makefile
>   head/dns/dnsmasq/Makefile
>
> Modified: head/audio/soundtracker/Makefile
> ==============================================================================
> --- head/audio/soundtracker/Makefile    Fri Apr 26 15:10:03 2013        (r316619)
> +++ head/audio/soundtracker/Makefile    Fri Apr 26 15:10:57 2013        (r316620)
> @@ -31,7 +31,7 @@ DESKTOP_ENTRIES="SoundTracker" "Pattern-
>                 "${PREFIX}/share/pixmaps/${PORTNAME}.xpm" \
>                 "soundtracker" "AudioVideo;Audio;AudioVideoEditing;" false
>
> -.include <bsd.port.pre.mk>
> +.include <bsd.port.options.mk>
>
>  .if ${PORT_OPTIONS:MASM}
>  CONFIGURE_ARGS+=       --enable-asm
> @@ -57,7 +57,7 @@ CONFIGURE_ARGS+=      --disable-sdl
>  .endif
>
>  .if ${PORT_OPTIONS:MNLS}
> -USE_GETTEXT=   yes
> +USES+=         gettext
>  PLIST_SUB+=    NLS=""
>  .else
>  CONFIGURE_ARGS+=       --disable-nls
> @@ -83,4 +83,4 @@ post-install:
>         ${INSTALL_DATA} ${WRKSRC}/sharp.xpm \
>                 ${PREFIX}/share/pixmaps/soundtracker.xpm
>
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
>
> Modified: head/comms/fldigi/Makefile
> ==============================================================================
> --- head/comms/fldigi/Makefile  Fri Apr 26 15:10:03 2013        (r316619)
> +++ head/comms/fldigi/Makefile  Fri Apr 26 15:10:57 2013        (r316620)
> @@ -24,7 +24,7 @@ USE_GMAKE=    yes
>  CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config"
>  MAN1=          fldigi.1
>
> -OPTIONS_DEFINE=        NATIVE_OPT FLARQ XMLRPC OSS SNDFILE PORTAUDIO PULSEAUDIO HAMLIB
> +OPTIONS_DEFINE=        NATIVE_OPT FLARQ XMLRPC OSS SNDFILE PORTAUDIO PULSEAUDIO HAMLIB NLS
>
>  NATIVE_OPT_DESC=       Enable Native Optimizations
>  FLARQ_DESC=            Compile flarq
> @@ -94,13 +94,13 @@ LIB_DEPENDS+=       hamlib:${PORTSDIR}/comms/h
>  .else
>  CONFIGURE_ARGS+=--without-hamlib
>  .endif
> -.if defined(WITHOUT_NLS)
> -CONFIGURE_ARGS+=--disable-nls
> -PLIST_SUB+=    NLS="@comment "
> -.else
> +.if ${PORT_OPTIONS:MNLS}
> +USES+= gettext
>  CONFIGURE_ARGS+=--enable-nls
>  PLIST_SUB+=    NLS=""
> -USE_GETTEXT=   yes
> +.else
> +CONFIGURE_ARGS+=--disable-nls
> +PLIST_SUB+=    NLS="@comment "
>  .endif
>  # Always need asciidoc for man pages
>  CONFIGURE_ARGS+=--with-asciidoc
>
> Modified: head/comms/hylafax/Makefile
> ==============================================================================
> --- head/comms/hylafax/Makefile Fri Apr 26 15:10:03 2013        (r316619)
> +++ head/comms/hylafax/Makefile Fri Apr 26 15:10:57 2013        (r316620)
> @@ -53,12 +53,12 @@ MAN8=       choptest.8c cqtest.8c dialtest.8c
>  SUID_EXES=     ${PREFIX}/sbin/faxgetty ${PREFIX}/sbin/faxq \
>                 ${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter
>
> -OPTIONS_DEFINE=        PAM NLS GAWK
> +OPTIONS_DEFINE=        PAM NLS GAWK DOCS
>  OPTIONS_DEFAULT=PAM NLS
>  NO_OPTIONS_SORT=yes
>  GAWK_DESC=     Use gawk for scripts
>
> -.include <bsd.port.pre.mk>
> +.include <bsd.port.options.mk>
>
>  # Defaults to "North American Letter".  Use "ISO A4" for A4.
>  .if defined(PAGESIZE)
> @@ -71,7 +71,7 @@ CONFIGURE_ARGS+=--disable-pam
>  .endif
>
>  # Want HTML documentation?
> -.if !defined(NOPORTDOCS)
> +.if ${PORT_OPTIONS:MDOCS}
>  CONFIGURE_ARGS+=--with-HTML=yes
>  PLIST_SUB+=    PORTDOCS=""
>  .else
> @@ -95,7 +95,7 @@ RUN_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
>  CONFIGURE_ARGS+=--with-AWK="${LOCALBASE}/bin/gawk"
>  .endif
>  .if ${PORT_OPTIONS:MNLS}
> -USE_GETTEXT=   yes
> +USES+= gettext
>  PLIST_SUB+=    WITH_NLS=""
>  .else
>  CONFIGURE_ARGS+=--disable-nls
> @@ -128,7 +128,7 @@ post-install:
>  .for f in hfaxd.conf pagesizes typerules
>         if [ ! -f ${PREFIX}/lib/fax/${f} ]; then ${CP} -p ${PREFIX}/lib/fax/${f}-dist ${PREFIX}/lib/fax/${f}; fi
>  .endfor
> -.if !defined(NOPORTDOCS)
> +.if ${PORT_OPTIONS:MDOCS}
>         ${MKDIR} ${DOCSDIR}
>         @cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
>  .endif
> @@ -138,4 +138,4 @@ post-install:
>  CONFIGURE_ARGS+=       --with-GETTY=SysV
>  .endif
>
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
>
> Modified: head/databases/postgresql84-server/Makefile
> ==============================================================================
> --- head/databases/postgresql84-server/Makefile Fri Apr 26 15:10:03 2013        (r316619)
> +++ head/databases/postgresql84-server/Makefile Fri Apr 26 15:10:57 2013        (r316620)
> @@ -133,8 +133,6 @@ EXTRA_PATCHES+=     ${FILESDIR}/extra-patch-
>  .  endif
>  .endif # !SLAVE_ONLY
>
> -.include <bsd.port.pre.mk>
> -

This broke detection of PKGMESSAGE in FILESDIR.

I've restored the pre and post here, because they were important; this
fixes packaging on non-pkgng versions.

Chris