- zap PFRAG.shared

- don't hardcode 4.0
- clean up do/post-install
- bump PKGNAME

feedback and ok steven@

x11/pypanel/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2006/12/21 09:09:26 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2006/12/28 22:36:16 jasper Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	"lightweight panel written in Python and C for X11"
 
 DISTNAME=	PyPanel-2.4
-PKGNAME=	${DISTNAME:L}
+PKGNAME=	${DISTNAME:L}p0
 CATEGORIES=	x11
 
 HOMEPAGE=	http://pypanel.sourceforge.net/
@@ -27,17 +27,19 @@ LIB_DEPENDS=	Imlib2.>=2::graphics/imlib2
 USE_X11=	Yes
 NO_REGRESS=	Yes
 
-SITE_PATH=	${PREFIX}/lib/python${MODPY_VERSION}/site-packages/
+PYTHONPATH=	${WRKINST}${MODPY_SITEPKG}
 
 pre-configure:
 	@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g; \
 	s,!!X11BASE!!,${X11BASE},g;' ${WRKSRC}/setup.py
+	@perl -pi -e 's,/etc,${SYSCONFDIR},g' ${WRKSRC}/pypanel
 
-do-install:
+post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/pypanel ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pypanel
-	${INSTALL_DATA_DIR} ${SITE_PATH}/pypanel
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pypanel
-	${INSTALL_DATA} ${WRKSRC}/lib.openbsd-4.0-*/ppmodule.so ${SITE_PATH}
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pypanel
-	${INSTALL_DATA} ${WRKSRC}/{README,ppicon.png,pypanelrc} \
+	${INSTALL_DATA_DIR} ${PYTHONPATH}/pypanel
-		${SITE_PATH}/pypanel
+	${INSTALL_DATA} ${WRKSRC}/ppicon.png ${PYTHONPATH}/pypanel
+	${INSTALL_DATA} ${WRKSRC}/pypanelrc ${PREFIX}/share/examples/pypanel
 
 .include <bsd.port.mk>

x11/pypanel/patches/patch-setup_py

@@ -1,7 +1,7 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2006/12/21 09:09:26 jasper Exp $
+$OpenBSD: patch-setup_py,v 1.2 2006/12/28 22:36:16 jasper Exp $
---- setup.py.orig	Mon Dec 18 08:02:19 2006
+--- setup.py.orig	Thu Jun 23 03:48:49 2005
-+++ setup.py	Mon Dec 18 08:05:38 2006
++++ setup.py	Thu Dec 28 20:38:37 2006
-@@ -3,10 +3,10 @@ from distutils.core import Extension, se
+@@ -3,10 +3,10 @@
  from distutils import sysconfig
  
  # Full paths to imlib2-config and freetype-config, adjust as needed -
@@ -14,7 +14,7 @@ $OpenBSD: patch-setup_py,v 1.1.1.1 2006/12/21 09:09:26 jasper Exp $
  
  # Add any additional library directories here -
  ldirs   = []
-@@ -15,7 +15,7 @@ ldirs   = []
+@@ -15,7 +15,7 @@
  cargs   = ["-Wall"]
  
  # Full path to libImlib2 shared library
@@ -23,3 +23,12 @@ $OpenBSD: patch-setup_py,v 1.1.1.1 2006/12/21 09:09:26 jasper Exp $
  
  #------------------------------------------------------------------------------
  # The rest of this script should not need to be modified! 
+@@ -117,7 +117,7 @@
+       description      = "Lightweight panel/taskbar for X11 Window Managers",
+       long_description = "See README for more information",
+       url              = "http://pypanel.sourceforge.net",
+-      data_files       = [(install_dir, files)],
++#      data_files       = [(install_dir, files)],
+       scripts          = ["pypanel"],
+       ext_modules      = [module]
+      )

x11/pypanel/pkg/PFRAG.shared

@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/12/21 09:09:26 jasper Exp $
-lib/python${MODPY_VERSION}/site-packages/ppmodule.so

x11/pypanel/pkg/PLIST

@@ -1,9 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/12/21 09:09:26 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2006/12/28 22:36:16 jasper Exp $
-%%SHARED%%
 bin/pypanel
+lib/python${MODPY_VERSION}/site-packages/ppmodule.so
 lib/python${MODPY_VERSION}/site-packages/pypanel/
-@sample ${PREFIX}/share/examples/pypanel/
-lib/python${MODPY_VERSION}/site-packages/pypanel/README
 lib/python${MODPY_VERSION}/site-packages/pypanel/ppicon.png
-lib/python${MODPY_VERSION}/site-packages/pypanel/pypanelrc
+share/doc/pypanel/
-@sample ${PREFIX}/share/examples/pypanel/pypanelrc
+share/doc/pypanel/README
+share/examples/pypanel/
+share/examples/pypanel/pypanelrc
+@sample ${SYSCONFDIR}/pypanelrc