5 files changed, 19 insertions, 48 deletions

diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile
index b4fe4ab97a46..c82187cfbfc2 100644
--- a/deskutils/xpad/Makefile
+++ b/deskutils/xpad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xpad
-PORTVERSION=	1.9.1
+PORTVERSION=	1.13
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,24 +14,26 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	amyfoub@videotron.ca
 COMMENT=	A virtual note-pad system for your X11 desktop
 
-WRKSRC=		${WRKDIR}/xpad-${PORTVERSION}
+#WRKSRC=		${WRKDIR}/${DISTNAME}
 
+USE_BZIP2=	yes
+
+#USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 
-HAS_CONFIGURE= yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 
 MAN1=		xpad.1
 MANCOMPRESSED=	no
 
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/xpad
-	${INSTALL_DATA} ${WRKSRC}/doc/README ${PREFIX}/share/doc/xpad/
-	@${MKDIR} ${PREFIX}/share/examples/xpad
-	${INSTALL_DATA} ${WRKSRC}/xpad.desktop ${PREFIX}/share/examples/xpad/
-	@${CAT} pkg-message
-.endif
-	@${RM} /xpad.desktop
+do-install:
+
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xpad ${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/doc/xpad.1 ${PREFIX}/man/man1/
+	@${MKDIR} ${PREFIX}/share/xpad
+	${INSTALL_DATA} ${WRKSRC}/images/xpad.xpm ${PREFIX}/share/xpad/
+	${INSTALL_DATA} ${WRKSRC}/images/xpad2.xpm ${PREFIX}/share/xpad/
+	${INSTALL_DATA} ${WRKSRC}/images/sticky.xpm ${PREFIX}/share/xpad/
 
 .include <bsd.port.mk>
diff --git a/deskutils/xpad/distinfo b/deskutils/xpad/distinfo
index b2e97d87dc82..3b810d60ca70 100644
--- a/deskutils/xpad/distinfo
+++ b/deskutils/xpad/distinfo
@@ -1 +1 @@
-MD5 (xpad-1.9.1.tar.gz) = 05e52fe86f421ea4c770e8480cb40d4f
+MD5 (xpad-1.13.tar.bz2) = 8b844f8a3c0cdc930162683aaeaca28e
diff --git a/deskutils/xpad/files/patch-src::sm.c b/deskutils/xpad/files/patch-src::sm.c
deleted file mode 100644
index 776a8d8393a4..000000000000
--- a/deskutils/xpad/files/patch-src::sm.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/sm.c.orig	Thu Feb  6 16:05:59 2003
-+++ src/sm.c	Mon Oct  6 16:09:35 2003
-@@ -25,12 +25,13 @@
- #include "main.h"
- #include <X11/SM/SMlib.h>
- #include <stdio.h>	/* only for printf */
--#include <sys/select.h>	/* for select */
-+#include <sys/types.h>	/* only for printf */
-+#include <sys/select.h>
-+#include <sys/time.h>	
- #include <stdlib.h>	/* for free */
- #include <string.h>	/* for strlen */
- #include <unistd.h>	/* for getuid */
- #include <pwd.h>	/* for getpwuid */
--#include <sys/types.h>	/* for getuid and getpwuid */
- 
- static SmcConn xpad_sm_conn = NULL;
- static int xpad_interact_style;
diff --git a/deskutils/xpad/pkg-message b/deskutils/xpad/pkg-message
deleted file mode 100644
index 71bf6d3151e1..000000000000
--- a/deskutils/xpad/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
------------------------------------------------------------------------------
-
-1) See /usr/local/share/doc/xpad/README for some useful informations.
-
-2) If you are using KDE, copy /usr/local/share/example/xpad/xpad.desktop to:
-
-              ~/.kde/share/applnk/Utilities/
-                            or
-              /usr/local/share/applnk/Utilities/
-
------------------------------------------------------------------------------
diff --git a/deskutils/xpad/pkg-plist b/deskutils/xpad/pkg-plist
index 49e04ecabc48..c9e1f38c7a7e 100644
--- a/deskutils/xpad/pkg-plist
+++ b/deskutils/xpad/pkg-plist
@@ -1,7 +1,5 @@
 bin/xpad
-share/pixmaps/xpad.xpm
-@dirrm share/pixmaps
-%%PORTDOCS%%share/doc/xpad/README
-%%PORTDOCS%%share/examples/xpad/xpad.desktop
-%%PORTDOCS%%@dirrm share/doc/xpad
-%%PORTDOCS%%@dirrm share/examples/xpad
+share/xpad/xpad.xpm
+share/xpad/xpad2.xpm
+share/xpad/sticky.xpm
+@dirrm share/xpad