svn commit: r394780 - in head: astro/boinc-setiathome-v7 audio/liblo audio/ncmpc audio/ncmpcpp audio/shoutcast audio/vagalume biology/xmolwt cad/dinotrace comms/xastir

[Mathieu Arnold]

Author: mat
Date: Wed Aug 19 13:41:51 2015
New Revision: 394780
URL: https://svnweb.freebsd.org/changeset/ports/394780

Log:
  Fix previous commit.
  
  Pointy hat to:	mat
  Sponsored by:	Absolight

Modified:
  head/astro/boinc-setiathome-v7/Makefile
  head/audio/liblo/Makefile
  head/audio/ncmpc/Makefile
  head/audio/ncmpcpp/Makefile
  head/audio/shoutcast/Makefile
  head/audio/vagalume/Makefile
  head/biology/xmolwt/Makefile
  head/cad/dinotrace/Makefile
  head/comms/xastir/Makefile

Modified: head/astro/boinc-setiathome-v7/Makefile
==============================================================================
--- head/astro/boinc-setiathome-v7/Makefile	Wed Aug 19 13:34:55 2015	(r394779)
+++ head/astro/boinc-setiathome-v7/Makefile	Wed Aug 19 13:41:51 2015	(r394780)
@@ -47,10 +47,8 @@ X11_CONFIGURE_ENABLE=	graphics
 
 X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
 
-.if ${ARCH} == i386 || ${ARCH} == amd64
-# comment out if world is built with clang and port with gcc
-CFLAGS+=	-mtune=native
-.endif
+CFLAGS_i386=	-mtune=native
+CFLAGS_amd64=	-mtune=native
 
 .if !empty(MACHINE_CPU:Maltivec)
 CONFIGURE_ARGS+=	--enable-altivec

Modified: head/audio/liblo/Makefile
==============================================================================
--- head/audio/liblo/Makefile	Wed Aug 19 13:34:55 2015	(r394779)
+++ head/audio/liblo/Makefile	Wed Aug 19 13:41:51 2015	(r394780)
@@ -26,6 +26,8 @@ OPTIONS_SUB=	yes
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 
+.include <bsd.port.options.mk>
+
 post-patch:
 .if ${ARCH} == i386 || ${ARCH} == powerpc
 	@${REINPLACE_CMD} -e 's,deadbeef,, ; s,f00baa23,,' \

Modified: head/audio/ncmpc/Makefile
==============================================================================
--- head/audio/ncmpc/Makefile	Wed Aug 19 13:34:55 2015	(r394779)
+++ head/audio/ncmpc/Makefile	Wed Aug 19 13:41:51 2015	(r394780)
@@ -60,6 +60,5 @@ do-install-LYRICS-on:
 	(cd ${WRKSRC}/lyrics && ${INSTALL_SCRIPT} \
 		10-hd.sh 20-lyricwiki.rb \
 		${STAGEDIR}${PREFIX}/lib/ncmpc/lyrics)
-.endif
 
 .include <bsd.port.mk>

Modified: head/audio/ncmpcpp/Makefile
==============================================================================
--- head/audio/ncmpcpp/Makefile	Wed Aug 19 13:34:55 2015	(r394779)
+++ head/audio/ncmpcpp/Makefile	Wed Aug 19 13:41:51 2015	(r394780)
@@ -50,6 +50,8 @@ OUTPUTS_CONFIGURE_ENABLE=	outputs
 VISUALIZER_BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
 VISUALIZER_CONFIGURE_ENABLE=	visualizer
 
+.include <bsd.port.pre.mk>
+
 .if ${NCURSESBASE} == /usr
 # no need to use ncurses-config if we use ncurses from the base system
 CONFIGURE_ARGS+=	NCURSES_CONFIG=/usr/bin/true
@@ -62,4 +64,4 @@ post-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/bindings ${WRKSRC}/doc/config ${STAGEDIR}${DOCSDIR}/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/audio/shoutcast/Makefile
==============================================================================
--- head/audio/shoutcast/Makefile	Wed Aug 19 13:34:55 2015	(r394779)
+++ head/audio/shoutcast/Makefile	Wed Aug 19 13:41:51 2015	(r394780)
@@ -51,6 +51,8 @@ SUB_LIST=	${SHOUTCAST_SUB}
 USERS=		${SHOUTCASTUSER}
 GROUPS=		${SHOUTCASTGROUP}
 
+.include <bsd.port.options.mk>
+
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000010
 .if ${ARCH} == "i386"
 RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x

Modified: head/audio/vagalume/Makefile
==============================================================================
--- head/audio/vagalume/Makefile	Wed Aug 19 13:34:55 2015	(r394779)
+++ head/audio/vagalume/Makefile	Wed Aug 19 13:41:51 2015	(r394780)
@@ -41,7 +41,6 @@ NLS_CONFIGURE_ENABLE=	nls
 
 GCONF_USE=	GNOME=gconf2
 GCONF_CONFIGURE_ENABLE=	gconf
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|serviceentrydir = @serviceentrydir@|serviceentrydir = ${PREFIX}/share/dbus-1/services|' \

Modified: head/biology/xmolwt/Makefile
==============================================================================
--- head/biology/xmolwt/Makefile	Wed Aug 19 13:34:55 2015	(r394779)
+++ head/biology/xmolwt/Makefile	Wed Aug 19 13:41:51 2015	(r394780)
@@ -24,7 +24,6 @@ GTK2_USE=	GNOME=gtk20
 GTK2_MAKE_ENV=	GTKCONFIG="pkg-config gtk+-2.0"
 GTK2_USE_OFF=	GNOME=gtk12
 GTK2_MAKE_ENV_OFF=	GTKCONFIG="${GTK_CONFIG}"
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \

Modified: head/cad/dinotrace/Makefile
==============================================================================
--- head/cad/dinotrace/Makefile	Wed Aug 19 13:34:55 2015	(r394779)
+++ head/cad/dinotrace/Makefile	Wed Aug 19 13:41:51 2015	(r394780)
@@ -41,6 +41,5 @@ post-install-EMACS-on:
 .for F in dinotrace.el sim-log.el
 	${INSTALL_DATA} ${WRKSRC}/lisp/${F} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/comms/xastir/Makefile
==============================================================================
--- head/comms/xastir/Makefile	Wed Aug 19 13:34:55 2015	(r394779)
+++ head/comms/xastir/Makefile	Wed Aug 19 13:41:51 2015	(r394780)
@@ -74,4 +74,4 @@ OPTCFLAGS_CFLAGS=	-O2 -pipe
 
 BROKEN_sparc64=		Does not compile on sparc64
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>