Index: head/deskutils/pypanel/Makefile
===================================================================
--- head/deskutils/pypanel/Makefile	(revision 401558)
+++ head/deskutils/pypanel/Makefile	(revision 401559)
@@ -1,50 +1,52 @@
 # Created by: Florian Unglaub <flo@btw23.de>
 # $FreeBSD$
 
 PORTNAME=	pypanel
 PORTVERSION=	2.4
 PORTREVISION=	12
 CATEGORIES=	deskutils
 MASTER_SITES=	SF
 DISTNAME=	PyPanel-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop panel written in Python
 
 LICENSE=	GPLv2 # or later
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libImlib2.so:${PORTSDIR}/graphics/imlib2
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	autoplist distutils
 USE_XORG=	xft
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/bin/freetype-config|${LOCALBASE}/bin/freetype-config|; \
 		 s|/usr/bin/imlib2-config|${LOCALBASE}/bin/imlib2-config|; \
 		 s|/usr/X11R6/include|${LOCALBASE}/include|; \
 		 s|"COPYING", "README", ||' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e 's|sysconfig\.get_python_lib()|"${PREFIX}/share"|' \
 		${WRKSRC}/setup.py ${WRKSRC}/pypanel
 	@${REINPLACE_CMD} -e \
 		's|/usr/lib/libImlib2.so.1|${LOCALBASE}/lib/libImlib2.so|' \
 		${WRKSRC}/setup.py ${WRKSRC}/ppmodule.c
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' ${WRKSRC}/pypanel
 	@${REINPLACE_CMD} -e 's|/usr/share/imlib2|${LOCALBASE}/share/imlib2|' \
 		${WRKSRC}/pypanelrc
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ppmodule.so
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ppmodule.so
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/deskutils/pypanel/files/patch-pypanel
===================================================================
--- head/deskutils/pypanel/files/patch-pypanel	(revision 401558)
+++ head/deskutils/pypanel/files/patch-pypanel	(revision 401559)
@@ -1,31 +1,31 @@
---- pypanel.orig	2005-06-26 19:24:43.000000000 -0400
-+++ pypanel	2008-12-08 00:06:37.000000000 -0500
-@@ -95,6 +95,7 @@
+--- pypanel.orig	2005-06-26 23:24:43 UTC
++++ pypanel
+@@ -95,6 +95,7 @@ class PyPanel(object):
          self.root.change_attributes(event_mask=(X.PropertyChangeMask)) 
          self.window.map()
          self.display.flush()
 +        self.updatePanel(self.root, self.window, self.panel)
          self.loop(self.display, self.root, self.window, self.panel)
                  
      #------------------------------------
-@@ -944,6 +945,9 @@
+@@ -944,6 +945,9 @@ if __name__ == "__main__":
      main   = 2.4
      config = globals().get("VERSION", None)
      
 +    # Get the startup delay
 +    delay  = globals().get("STARTUP_DELAY", None)
 +    
      # Set locale to user's default
      locale.setlocale(locale.LC_ALL, "")
      
-@@ -953,5 +957,9 @@
+@@ -953,5 +957,9 @@ if __name__ == "__main__":
          sys.stderr.write("\nA current pypanelrc example can be found here -\n")
          sys.stderr.write("%s/pypanel/pypanelrc\n\n" % sysconfig.get_python_lib())
      del main, config
 -
 +    
 +    # If delay is set, pause, and let windowmanager load
 +    if delay:
 +	    time.sleep(delay)
 +	    
      PyPanel(display.Display())
Index: head/deskutils/pypanel/files/patch-pypanelrc
===================================================================
--- head/deskutils/pypanel/files/patch-pypanelrc	(revision 401558)
+++ head/deskutils/pypanel/files/patch-pypanelrc	(revision 401559)
@@ -1,15 +1,15 @@
---- pypanelrc.orig	2005-06-26 19:27:37.000000000 -0400
-+++ pypanelrc	2008-12-08 00:06:54.000000000 -0500
+--- pypanelrc.orig	2005-06-26 23:27:37 UTC
++++ pypanelrc
 @@ -9,6 +9,12 @@
  VERSION         = 2.4           # Config file version
  
  #------------------------------------------------------------------------------
 +# Startup delay: The time to wait before painting the pypanel window. This lets
 +# the background load up so that pypanel will be displayed correctly. 
 +#------------------------------------------------------------------------------
 +STARTUP_DELAY   = 2
 +
 +#------------------------------------------------------------------------------
  # Colors: Format is hex triplet - 0xrrggbb
  #------------------------------------------------------------------------------
  BG_COLOR        = "0xd6d6d6"    # Panel background and tinting color