Date: Sat, 6 Oct 2012 23:01:46 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305423 - in head: deskutils/orage print/xfce4-print x11-fm/thunar-vfs Message-ID: <201210062301.q96N1kTD059862@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eadler Date: Sat Oct 6 23:01:46 2012 New Revision: 305423 URL: http://svn.freebsd.org/changeset/ports/305423 Log: Correct logic from OptionsNG conversion. Pointhat to: me Modified: head/deskutils/orage/Makefile head/print/xfce4-print/Makefile head/x11-fm/thunar-vfs/Makefile Modified: head/deskutils/orage/Makefile ============================================================================== --- head/deskutils/orage/Makefile Sat Oct 6 22:54:38 2012 (r305422) +++ head/deskutils/orage/Makefile Sat Oct 6 23:01:46 2012 (r305423) @@ -75,7 +75,7 @@ post-patch: s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g ; \ s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|g' ${WRKSRC}/configure .endif -.if ${PORT_OPTIONS:MICAL} +.if empty(PORT_OPTIONS:MICAL) @${REINPLACE_CMD} -e 's|libical-|no-&|g' ${WRKSRC}/configure .endif @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure Modified: head/print/xfce4-print/Makefile ============================================================================== --- head/print/xfce4-print/Makefile Sat Oct 6 22:54:38 2012 (r305422) +++ head/print/xfce4-print/Makefile Sat Oct 6 23:01:46 2012 (r305423) @@ -40,14 +40,13 @@ PLIST_SUB+= CUPS="@comment " .endif .if ${PORT_OPTIONS:MLPR} -CONFIGURE_ARGS+=--disable-bsdlpr -PLIST_SUB+= LPR="@comment " -.else CONFIGURE_ARGS+=--enable-bsdlpr --with-printcap=/etc/printcap PLIST_SUB+= LPR="" +.else +CONFIGURE_ARGS+=--disable-bsdlpr +PLIST_SUB+= LPR="@comment " .endif - .if ${PORT_OPTIONS:MLETTER} CONFIGURE_ARGS+=--enable-letter BUILD_DEPENDS+= a2ps:${PORTSDIR}/print/a2ps-letter Modified: head/x11-fm/thunar-vfs/Makefile ============================================================================== --- head/x11-fm/thunar-vfs/Makefile Sat Oct 6 22:54:38 2012 (r305422) +++ head/x11-fm/thunar-vfs/Makefile Sat Oct 6 23:01:46 2012 (r305423) @@ -75,11 +75,11 @@ CONFIGURE_ARGS+=--disable-gnome-thumbnai .endif .if ${PORT_OPTIONS:MAPIDOCS} -CONFIGURE_ARGS+=--without-html-dir -PLIST_SUB+= APIDOCS="@comment " -.else CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html PLIST_SUB+= APIDOCS="" +.else +CONFIGURE_ARGS+=--without-html-dir +PLIST_SUB+= APIDOCS="@comment " .endif post-patch:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210062301.q96N1kTD059862>