svn commit: r349807 - in head/deskutils: alacarte deskbar-applet glabels glabels/files gnome-blog gnome-main-menu gnome-utils gnote gucharmap hamster-applet nautilus-locked-folder notification-daem...

Koop Mast kwm at FreeBSD.org
Mon Mar 31 22:07:24 UTC 2014


Author: kwm
Date: Mon Mar 31 22:07:21 2014
New Revision: 349807
URL: http://svnweb.freebsd.org/changeset/ports/349807
QAT: https://qat.redports.org/buildarchive/r349807/

Log:
  Stagify.

Added:
  head/deskutils/glabels/files/
  head/deskutils/glabels/files/patch-data_mime_Makefile.in   (contents, props changed)
Modified:
  head/deskutils/alacarte/Makefile
  head/deskutils/deskbar-applet/Makefile
  head/deskutils/glabels/Makefile
  head/deskutils/glabels/pkg-plist
  head/deskutils/gnome-blog/Makefile
  head/deskutils/gnome-main-menu/Makefile
  head/deskutils/gnome-utils/Makefile
  head/deskutils/gnome-utils/pkg-plist
  head/deskutils/gnote/Makefile
  head/deskutils/gucharmap/Makefile
  head/deskutils/hamster-applet/Makefile
  head/deskutils/nautilus-locked-folder/Makefile
  head/deskutils/notification-daemon/Makefile
  head/deskutils/ontv/Makefile

Modified: head/deskutils/alacarte/Makefile
==============================================================================
--- head/deskutils/alacarte/Makefile	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/alacarte/Makefile	Mon Mar 31 22:07:21 2014	(r349807)
@@ -21,7 +21,6 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
 		${WRKSRC}/Alacarte/MenuEditor.py

Modified: head/deskutils/deskbar-applet/Makefile
==============================================================================
--- head/deskutils/deskbar-applet/Makefile	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/deskbar-applet/Makefile	Mon Mar 31 22:07:21 2014	(r349807)
@@ -31,7 +31,6 @@ OPTIONS_DEFINE=	EVO
 OPTIONS_DEFAULT=EVO
 EVO_DESC=	Enable evolution support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEVO}

Modified: head/deskutils/glabels/Makefile
==============================================================================
--- head/deskutils/glabels/Makefile	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/glabels/Makefile	Mon Mar 31 22:07:21 2014	(r349807)
@@ -22,9 +22,6 @@ USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include -DGLIB_COMPILATION
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		glabels.1
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mevolutiondataserver}!=""

Added: head/deskutils/glabels/files/patch-data_mime_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/glabels/files/patch-data_mime_Makefile.in	Mon Mar 31 22:07:21 2014	(r349807)
@@ -0,0 +1,11 @@
+--- data/mime/Makefile.in.orig	2014-03-31 23:47:20.000000000 +0200
++++ data/mime/Makefile.in	2014-03-31 23:48:26.000000000 +0200
+@@ -513,7 +513,7 @@
+ 
+ install-data-hook:
+ @ENABLE_UPDATE_MIMEDB_TRUE@@HAVE_NEW_MIME_TRUE@	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+- at ENABLE_UPDATE_DESKTOPDB_TRUE@@HAVE_NEWER_MIME_TRUE@	$(UPDATE_DESKTOP_DATABASE) 
++#@ENABLE_UPDATE_DESKTOPDB_TRUE@@HAVE_NEWER_MIME_TRUE@	$(UPDATE_DESKTOP_DATABASE) 
+ 
+ uninstall-hook:
+ @ENABLE_UPDATE_MIMEDB_TRUE@@HAVE_NEW_MIME_TRUE@	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"

Modified: head/deskutils/glabels/pkg-plist
==============================================================================
--- head/deskutils/glabels/pkg-plist	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/glabels/pkg-plist	Mon Mar 31 22:07:21 2014	(r349807)
@@ -16,6 +16,7 @@ lib/libglabels.la
 lib/libglabels.so
 lib/libglabels.so.5
 libdata/pkgconfig/libglabels.pc
+man/man1/glabels.1.gz
 share/application-registry/glabels.applications
 share/applications/glabels.desktop
 share/doc/libglabels/ch01.html

Modified: head/deskutils/gnome-blog/Makefile
==============================================================================
--- head/deskutils/gnome-blog/Makefile	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/gnome-blog/Makefile	Mon Mar 31 22:07:21 2014	(r349807)
@@ -22,5 +22,4 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnomeblog.schemas
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/deskutils/gnome-main-menu/Makefile
==============================================================================
--- head/deskutils/gnome-main-menu/Makefile	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/gnome-main-menu/Makefile	Mon Mar 31 22:07:21 2014	(r349807)
@@ -24,7 +24,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	application-browser.schemas slab.schemas
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's|glib/gmacros.h|glib.h|g' \
 		-e 's|glib/gfileutils.h|glib.h|g' \

Modified: head/deskutils/gnome-utils/Makefile
==============================================================================
--- head/deskutils/gnome-utils/Makefile	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/gnome-utils/Makefile	Mon Mar 31 22:07:21 2014	(r349807)
@@ -31,13 +31,10 @@ CONFIGURE_ARGS=	--enable-maintainer-flag
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		gnome-dictionary.1 gnome-screenshot.1 gnome-search-tool.1 \
-		gnome-system-log.1 baobab.1
 GCONF_SCHEMAS=	gnome-dictionary.schemas gnome-screenshot.schemas \
 		gnome-search-tool.schemas baobab.schemas \
 		gnome-system-log.schemas
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/gsearchtool/libgnomeui-deprecated/Makefile.in

Modified: head/deskutils/gnome-utils/pkg-plist
==============================================================================
--- head/deskutils/gnome-utils/pkg-plist	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/gnome-utils/pkg-plist	Mon Mar 31 22:07:21 2014	(r349807)
@@ -24,6 +24,11 @@ lib/libgdict-1.0.so.6
 libdata/bonobo/servers/GNOME_DictionaryApplet.server
 libdata/pkgconfig/gdict-1.0.pc
 libexec/gnome-dictionary-applet
+man/man1/baobab.1.gz
+man/man1/gnome-dictionary.1.gz
+man/man1/gnome-screenshot.1.gz
+man/man1/gnome-search-tool.1.gz
+man/man1/gnome-system-log.1.gz
 share/doc/gdict/GdictClientContext.html
 share/doc/gdict/GdictDatabaseChooser.html
 share/doc/gdict/GdictDefbox.html

Modified: head/deskutils/gnote/Makefile
==============================================================================
--- head/deskutils/gnote/Makefile	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/gnote/Makefile	Mon Mar 31 22:07:21 2014	(r349807)
@@ -46,16 +46,15 @@ PLIST_SUB+=	APPLET="@comment "
 
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/include/boost|${LOCALBASE}/include/boost|g' \
 		${WRKSRC}/configure
 
 .ifndef (NOPORTDOCS)
 post-install:
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 

Modified: head/deskutils/gucharmap/Makefile
==============================================================================
--- head/deskutils/gucharmap/Makefile	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/gucharmap/Makefile	Mon Mar 31 22:07:21 2014	(r349807)
@@ -26,5 +26,4 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gucharmap.schemas
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/deskutils/hamster-applet/Makefile
==============================================================================
--- head/deskutils/hamster-applet/Makefile	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/hamster-applet/Makefile	Mon Mar 31 22:07:21 2014	(r349807)
@@ -30,7 +30,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	hamster-applet.schemas
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 # WAF needs that
@@ -43,11 +42,10 @@ do-build:
 	@cd ${WRKSRC} && ./waf build
 
 do-install:
-	@cd ${WRKSRC} && dbus-launch ./waf install
-# -O -Qold
-	@${PYTHON_CMD} -Qold ${PYTHON_LIBDIR}/compileall.py -q \
-		${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/hamster
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -q \
-		${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/hamster
+	@cd ${WRKSRC} && DESTDIR=${STAGEDIR} dbus-launch ./waf install
+	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
+	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 
 .include <bsd.port.post.mk>

Modified: head/deskutils/nautilus-locked-folder/Makefile
==============================================================================
--- head/deskutils/nautilus-locked-folder/Makefile	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/nautilus-locked-folder/Makefile	Mon Mar 31 22:07:21 2014	(r349807)
@@ -29,7 +29,6 @@ PLIST_FILES=	lib/nautilus/extensions-2.0
 		lib/nautilus/extensions-2.0/libnautilus-locked-folder.la \
 		lib/nautilus/extensions-2.0/libnautilus-locked-folder.so
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/icons/hicolor/32x32/stock/data/|${LOCALBASE}/share/icons/hicolor/32x32/stock/data/|' \
 		${WRKSRC}/src/lockedfolder-extension.c

Modified: head/deskutils/notification-daemon/Makefile
==============================================================================
--- head/deskutils/notification-daemon/Makefile	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/notification-daemon/Makefile	Mon Mar 31 22:07:21 2014	(r349807)
@@ -28,5 +28,4 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFLICTS=	xfce4-notification-daemon-[0-9]* xfce4-notifyd-[0-9]*
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/deskutils/ontv/Makefile
==============================================================================
--- head/deskutils/ontv/Makefile	Mon Mar 31 22:04:26 2014	(r349806)
+++ head/deskutils/ontv/Makefile	Mon Mar 31 22:07:21 2014	(r349807)
@@ -30,9 +30,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 GCONF_SCHEMAS=	ontv.schemas
 INSTALLS_ICONS=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/lib/python2.6|${PYTHON_LIBDIR}|' \
 		${WRKSRC}/bin/ontv
 
+post-install:
+	@${RM} -f ${STAGEDIR}${PREFIX}/share/gnome-control-center/keybindings/90-ontv.xml
+
 .include <bsd.port.mk>


More information about the svn-ports-all mailing list