Update to 1.3.4.

PR:		32864
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

4 files changed, 51 insertions, 47 deletions

diff --git a/x11-wm/swm/Makefile b/x11-wm/swm/Makefile
index 66c31f0320c..852938bb59d 100644
--- a/x11-wm/swm/Makefile
+++ b/x11-wm/swm/Makefile
@@ -6,43 +6,52 @@
 #
 
 PORTNAME=	swm
-PORTVERSION=	1.2.5
+PORTVERSION=	1.3.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.informatik.hu-berlin.de/~sperling/prog/
 EXTRACT_SUFX=	-src.tgz
 
 MAINTAINER=	trevor@FreeBSD.org
 
-BINS=		swm swmbg swmpanel swmswitch
+BINS=		swm swmbg swmswitch
 DOCDIR=		share/doc/${PORTNAME}
-DOCS=		AUTHORS COMPILE_PARAMS COPYING ChangeLog LIESMICH README \
-		README.iPaq swm.lsm
-EXAMPLES=	startswm.kde1 startswm.kde2
 MAN1=		swm.1 swmbg.1
+MAKEFILE=	Makefile-xpm
 PLIST=		${WRKDIR}/pkg-plist
 SCRIPTS=	startswm
 USE_GMAKE=	yes
 USE_XPM=	yes
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+
+post-patch:
+	${PERL} -pi -e "s:PREFIX:${PREFIX}:g" \
+		${WRKSRC}/init.c ${WRKSRC}/swm.conf
+
+post-build:
+	cd ${WRKSRC}/../swmbg && ${CC} ${CFLAGS} -I${X11BASE}/include *.c \
+		-o ${WRKSRC}/swmbg -lX11 -lXext -lXpm -L${X11BASE}/lib
+	cd ${WRKSRC}/../swmswitch && ${CC} ${CFLAGS} -I${X11BASE}/include *.c \
+	-o ${WRKSRC}/swmswitch -lX11 -L${X11BASE}/lib
 
 pre-install:
 	${RM} -f ${PLIST}
 	for i in ${BINS} ${SCRIPTS}; \
 		do ${ECHO_CMD} bin/$${i} >> ${PLIST}; \
 	done
+	cd ${WRKSRC}/../share/swm/pixmaps && \
+		${FIND} -s . -type f | cut -c3-999 | \
+		${SED} -e 's:^:share/swm/pixmaps/:' >> ${PLIST}
 .if !defined(NOPORTDOCS)
 	for i in ${DOCS}; \
 		do ${ECHO_CMD} ${DOCDIR}/$${i} >> ${PLIST}; \
 	done
-	for i in 1 2 3; \
-		do ${ECHO_CMD} ${DOCDIR}/examples/.swm/button$${i} >> ${PLIST}; \
-	done
-	for i in ${EXAMPLES}; \
-		do ${ECHO_CMD} ${DOCDIR}/examples/$${i} >> ${PLIST}; \
-	done
-	${ECHO_CMD} @dirrm ${DOCDIR}/examples/.swm >> ${PLIST}
-	${ECHO_CMD} @dirrm ${DOCDIR}/examples >> ${PLIST}
+	cd ${WRKSRC}/../doc && ${FIND} -s . -type f | cut -c3-999 \
+		| ${SED} -e 's:^:${DOCDIR}/:' >> ${PLIST}
+	cd ${WRKSRC}/../ && ${FIND} -s examples -type f \
+		| ${SED} -e 's:^examples:share/examples/swm:' >> ${PLIST}
+	cd ${WRKSRC}/../ && ${FIND} -d examples -type d | \
+		${SED} -e 's:^examples:@dirrm share/examples/swm:' >> ${PLIST}
 	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
@@ -52,20 +61,16 @@ do-install:
 	done
 	${INSTALL_SCRIPT} ${WRKSRC}/${SCRIPTS} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/swm.1x ${PREFIX}/man/man1/swm.1
-	${INSTALL_MAN} ${WRKSRC}/swmbg.1x ${PREFIX}/man/man1/swmbg.1
+	${INSTALL_MAN} ${WRKSRC}/../swmbg/swmbg.1x ${PREFIX}/man/man1/swmbg.1
 #	${INSTALL_MAN} ${WRKSRC}/swm-de.1x \
 #		${PREFIX}/man/de_DE.ISO_8859-1/man1/swm.1x
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${DOCDIR}
-	cd ${WRKSRC}/../ && \
-		${CHMOD} -R 755 examples && \
-		pax -r -w examples ${PREFIX}/${DOCDIR}
-.for i in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCDIR}/examples/
-.endfor
-	for i in ${DOCS}; \
-		do ${INSTALL_DATA} ${WRKSRC}/../$${i} ${PREFIX}/${DOCDIR}; \
-	done
+	${MKDIR} ${PREFIX}/${DOCDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/../ && ${CHMOD} -R 755 doc examples
+	cd ${WRKSRC}/../doc && pax -r -w * ${DOCSDIR}
+	cd ${WRKSRC}/../examples && pax -r -w * .swm ${EXAMPLESDIR}
 .endif
+	${MKDIR} ${DATADIR}/pixmaps
+	cd ${WRKSRC}/../share/swm/pixmaps && pax -r -w * ${DATADIR}/pixmaps
 
 .include <bsd.port.mk>
diff --git a/x11-wm/swm/distinfo b/x11-wm/swm/distinfo
index f135ec1b974..f5bd59d1bf2 100644
--- a/x11-wm/swm/distinfo
+++ b/x11-wm/swm/distinfo
@@ -1 +1 @@
-MD5 (swm-1.2.5-src.tgz) = 586c3d467347c9f5066d9275085cf358
+MD5 (swm-1.3.4-src.tgz) = 70df4f59ee8584bb3f11056c1ade1d9b
diff --git a/x11-wm/swm/files/patch-Makefile b/x11-wm/swm/files/patch-Makefile
deleted file mode 100644
index 8fcf63f53d6..00000000000
--- a/x11-wm/swm/files/patch-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.orig	Tue Mar 20 08:41:39 2001
-+++ Makefile	Fri Mar 30 01:06:27 2001
-@@ -2,16 +2,15 @@
- # the swm.conf file. Normally, you should not have to edit this Makefile. 
- 
- # Only for testing & devellopment
--CFLAGS   = -O0 -Wall -g3 -ggdb -p -H
- 
- # There should be nothing to edit below this line
- # -----------------------------------------------------------------------------
--CC			= gcc
-+CC			?= gcc
- 
- #LDPATH	 = -L$(XROOT)/lib -L/skiff/local/arm-linux/lib -L/skiff/local/lib/gcc-lib/arm-linux/2.95.2
- #INCLPATH = -I$(XROOT)/include -I/skiff/local/include -I/usr/include 
- 
--XROOT    = /usr/X11R6
-+XROOT    = ${X11BASE}
- INCLPATH = -I$(XROOT)/include
- LDPATH   = -L$(XROOT)/lib
- 
diff --git a/x11-wm/swm/files/patch-swm.conf b/x11-wm/swm/files/patch-swm.conf
new file mode 100644
index 00000000000..8c98619d3d6
--- /dev/null
+++ b/x11-wm/swm/files/patch-swm.conf
@@ -0,0 +1,20 @@
+--- swm.conf.orig	Mon Feb  4 05:08:58 2002
++++ swm.conf	Mon Apr  1 17:21:36 2002
+@@ -19,7 +19,7 @@
+ #define STD_IO
+ #define NUMBEROFDESKTOPS 4
+ #define FONTS
+-#define TITLEBARFONT "*monotype-*-12*" 
++#define TITLEBARFONT "*fixed-*-12*" 
+ #define LAYERS
+ #define MAXIMIZE
+ #define SHADE
+@@ -27,7 +27,7 @@
+ #define CENTERNEW
+ #define FOCUSNEW
+ #define PIXMAPS
+-#define PIXMAPDIR "/usr/share/swm"
++#define PIXMAPDIR "PREFIX/share/swm"
+ #define CONFDIR "$HOME"
+ #define FOREGROUND "gold" 
+ #define BACKGROUND "blue"