- Switch to options helpers

- Pet portlint
- Regenerate patches with `make makepatch`

deskutils/pypanel/Makefile

@@ -20,7 +20,7 @@ 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=	*
@@ -43,7 +43,9 @@ post-patch:
 		${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}
 

deskutils/pypanel/files/patch-pypanel

@@ -1,6 +1,6 @@
---- 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()
@@ -8,7 +8,7 @@
          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)
      
@@ -18,7 +18,7 @@
      # 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

deskutils/pypanel/files/patch-pypanelrc

@@ -1,5 +1,5 @@
---- 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