svn commit: r357579 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Thu Jun 12 10:10:50 2014
New Revision: 357579
URL: http://svnweb.freebsd.org/changeset/ports/357579
QAT: https://qat.redports.org/buildarchive/r357579/

Log:
  Make pkg_install aware of @fc @fcfontsdir and @fontsdir
  Simplify bsd.xorg.mk by only using those keywords
  run pkg_install.awk later to allow to use keywords in most of the targets in Mk/*
  
  Tested by:	mandree

Modified:
  head/Mk/bsd.port.mk
  head/Mk/bsd.xorg.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Jun 12 10:04:39 2014	(r357578)
+++ head/Mk/bsd.port.mk	Thu Jun 12 10:10:50 2014	(r357579)
@@ -4202,6 +4202,9 @@ fix-plist-sequence: ${TMPPLIST}
 	@${MV} -f ${TMPGUCMD} ${TMPPLIST}
 .endif
 .if !defined(WITH_PKGNG)
+	@cd ${.CURDIR} && { ${MAKE} pretty-print-config | fold -sw 120 | ${SED} -e 's/^/@comment OPTIONS:/'; } >> ${TMPPLIST}
+	@${AWK} -f ${KEYWORDS}/pkg_install.awk ${TMPPLIST} > ${TMPPLIST}.keyword && \
+	    ${MV} -f ${TMPPLIST}.keyword ${TMPPLIST}
 	@${ECHO_CMD} "@exec echo pkg_install EOL is scheduled for 2014-09-01. Please consider migrating to pkgng" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec echo http://blogs.freebsdish.org/portmgr/2014/02/03/time-to-bid-farewell-to-the-old-pkg_-tools/" >> ${TMPPLIST}
 .endif
@@ -5627,11 +5630,6 @@ generate-plist:
 .endif
 .endif
 .endif
-.if !defined(WITH_PKGNG)
-	@cd ${.CURDIR} && { ${MAKE} pretty-print-config | fold -sw 120 | ${SED} -e 's/^/@comment OPTIONS:/'; } >> ${TMPPLIST}
-	@${AWK} -f ${KEYWORDS}/pkg_install.awk ${TMPPLIST} > ${TMPPLIST}.keyword && \
-	    ${MV} -f ${TMPPLIST}.keyword ${TMPPLIST}
-.endif
 .endif
 
 ${TMPPLIST}:

Modified: head/Mk/bsd.xorg.mk
==============================================================================
--- head/Mk/bsd.xorg.mk	Thu Jun 12 10:04:39 2014	(r357578)
+++ head/Mk/bsd.xorg.mk	Thu Jun 12 10:10:50 2014	(r357579)
@@ -105,7 +105,6 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/mkfontdir
 .  endif
 
 post-install:
-.if defined(WITH_PKGNG)
 .  for _fontdir in ${FONTDIR}
 .    if ${INSTALLS_TTF} == yes && ${NEED_MKFONTFOO} == yes
 		@${ECHO_CMD} "@fcfontsdir lib/X11/fonts/${_fontdir}" >> ${TMPPLIST}
@@ -114,29 +113,9 @@ post-install:
 .    elif ${NEED_MKFONTFOO} == yes
 		@${ECHO_CMD} "@fontsdir lib/X11/fonts/${_fontdir}" >> ${TMPPLIST}
 .    else
-		@${ECHO_CMD} "@dirrmtry lib/X11/fonts/${_fontdir}" >> ${TMPPLIST}
+		@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
 .    endif
 .  endfor
-.else
-.  if ${INSTALLS_TTF} == "yes"
-.   for _fontdir in ${FONTDIR}
-	@${ECHO_CMD} "@exec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-.   endfor
-.  endif
-.  for _fontdir in ${FONTDIR}
-.   if ${NEED_MKFONTFOO} == "yes"
-	@${ECHO_CMD} "@exec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.scale -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.scale 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.scale; fi" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.dir -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.dir 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.dir; fi" >> ${TMPPLIST}
-.   endif
-	@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-.  endfor
-. endif
 .endif
 
 . if ${XORG_CAT} == "lib"