From owner-svn-ports-head@FreeBSD.ORG Sun Apr 28 14:00:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3E9346DD; Sun, 28 Apr 2013 14:00:55 +0000 (UTC) (envelope-from utisoft@gmail.com) Received: from mail-ie0-x235.google.com (mail-ie0-x235.google.com [IPv6:2607:f8b0:4001:c03::235]) by mx1.freebsd.org (Postfix) with ESMTP id E933D169D; Sun, 28 Apr 2013 14:00:54 +0000 (UTC) Received: by mail-ie0-f181.google.com with SMTP id tp5so6493462ieb.12 for ; Sun, 28 Apr 2013 07:00:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type; bh=l+Wrwf1GyQg+Ux6sr+ALVxV+IP7BolesTt45dwnpNqA=; b=gI1RlFgWetFKmJH6COiPLfH1mTwqIE5Q+TWvtOibRNORdy6HgbIZhIzH66uDfd7ndc +wiKRul7fGhGrtQrLPqd1r30f/BB6wV2zlrusCyoKTW7UQeAy+q+ksrquy/g1syjLH1t 3G1KbX9B+dx0dMTuN60dY8i+L/7gvu+FvZbh9GQ1GZ52h/1f9K8Q9eWFsvRaz1eH0XcE v2wtB5XaWc1aeaJbPBLKep7CDyg2QMeC9pz1SR1bR1GoaA99Z0/aq/WHVjifT32mA/SK k+wT7j4iqshCrjd8AWrM6dscU39d2Vbdtq+8UYgj5nn+Dw34iJYCe/lCb3xcJhSU0KT1 uboA== X-Received: by 10.50.108.104 with SMTP id hj8mr5690651igb.62.1367157653702; Sun, 28 Apr 2013 07:00:53 -0700 (PDT) MIME-Version: 1.0 Sender: utisoft@gmail.com Received: by 10.64.58.52 with HTTP; Sun, 28 Apr 2013 07:00:23 -0700 (PDT) In-Reply-To: <201304261510.r3QFAvhh025362@svn.freebsd.org> References: <201304261510.r3QFAvhh025362@svn.freebsd.org> From: Chris Rees Date: Sun, 28 Apr 2013 15:00:23 +0100 X-Google-Sender-Auth: 3_Lyw2U2XT0lAaPm7EM0HDaTIlg Message-ID: Subject: Re: 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... To: Baptiste Daroussin Content-Type: text/plain; charset=ISO-8859-1 Cc: "svn-ports-head@freebsd.org" , svn-ports-all@freebsd.org, "ports-committers@freebsd.org" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Apr 2013 14:00:55 -0000 On 26 April 2013 16:10, Baptiste Daroussin 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 > +.include > > .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 > +.include > > 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 > +.include > > # 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 > +.include > > 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 > - 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