Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Feb 2014 13:50:35 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r344106 - head/mail/gmail-notify
Message-ID:  <201402131350.s1DDoZ3w086784@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Thu Feb 13 13:50:35 2014
New Revision: 344106
URL: http://svnweb.freebsd.org/changeset/ports/344106
QAT: https://qat.redports.org/buildarchive/r344106/

Log:
  - STAGE-clean
  - Refactor a bit

Modified:
  head/mail/gmail-notify/Makefile

Modified: head/mail/gmail-notify/Makefile
==============================================================================
--- head/mail/gmail-notify/Makefile	Thu Feb 13 13:43:36 2014	(r344105)
+++ head/mail/gmail-notify/Makefile	Thu Feb 13 13:50:35 2014	(r344106)
@@ -16,30 +16,28 @@ USE_GNOME=	pygtk2
 USE_PYTHON=	yes
 USES=		gmake pkgconfig
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-EXTRAS_WRKSRC!=	cd ${PORTSDIR}/x11-toolkits/py-gnome-extras && ${MAKE} -V WRKSRC
+EXTRAS_DIR=	${PORTSDIR}/x11-toolkits/py-gnome-extras
 
 post-patch:
 	${SED} -e 's|@DATADIR@|${DATADIR}|' ${FILESDIR}/gmail-notifier > ${WRKSRC}/gmail-notifier
 	${SED} -e 's|@PYTHON_INCLUDEDIR@|${PYTHON_INCLUDEDIR}|' ${FILESDIR}/Makefile.in > ${WRKSRC}/Makefile
 
-pre-configure:
-	${CP} ${EXTRAS_WRKSRC}/egg/tray/eggtrayicon.[ch] ${EXTRAS_WRKSRC}/egg/tray/trayicon* ${WRKSRC}
+pre-build:
+	${CP} `${MAKE} -C ${EXTRAS_DIR} -V WRKSRC`/egg/tray/eggtrayicon.[ch] ${WRKSRC}
+	${CP} `${MAKE} -C ${EXTRAS_DIR} -V WRKSRC`/egg/tray/trayicon* ${WRKSRC}
 	${CP} ${FILESDIR}/config.h ${WRKSRC}
 	${RM} ${WRKSRC}/pytrayicon.so
 
 do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/gmail-notifier ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/*.py ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.png ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.jpg ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.so ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/langs.xml ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/gmail-notifier ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/*.py ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.png ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.jpg ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.so ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/langs.xml ${STAGEDIR}${DATADIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402131350.s1DDoZ3w086784>