Update to 1.2.2.

Don't install the German man page, because we have no place to put
it.

PR:	23822

3 files changed, 22 insertions, 26 deletions

diff --git a/x11-wm/swm/Makefile b/x11-wm/swm/Makefile
index 715640798983..29e4b54c3352 100644
--- a/x11-wm/swm/Makefile
+++ b/x11-wm/swm/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	swm
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.informatik.hu-berlin.de/~sperling/prog/
 EXTRACT_SUFX=	-src.tgz
 
 MAINTAINER=	trevor@FreeBSD.org
 
-BINS=		swm #swmswitch
+BINS=		swm swmbg #swmswitch
 DOCDIR=		share/doc/${PORTNAME}
 DOCS=		AUTHORS COMPILE_PARAMS COPYING ChangeLog LIESMICH README \
 		README.iPaq TODO startswm swm.lsm
-MAN1=		swm.1
+MAN1=		swm.1 swmbg.1
 PLIST=		${WRKDIR}/pkg-plist
 SCRIPTS=	startswm.default
 USE_GMAKE=	yes
@@ -29,7 +29,6 @@ pre-install:
 	for i in ${BINS} ${SCRIPTS}; \
 		do ${ECHO} bin/$${i} >> ${PLIST}; \
 	done
-	${ECHO} share/swm/background.jpg >> ${PLIST}
 .if !defined(NOPORTDOCS)
 	for i in ${DOCS}; \
 		do ${ECHO} ${DOCDIR}/$${i} >> ${PLIST}; \
@@ -49,11 +48,10 @@ do-install:
 	done
 	${INSTALL_SCRIPT} ${WRKSRC}/${SCRIPTS} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/swm.1x ${PREFIX}/man/man1/swm.1
-	${INSTALL_MAN} ${WRKSRC}/swm-de.1x \
-		${PREFIX}/man/de_DE.ISO_8859-1/man1/swm.1x
+	${INSTALL_MAN} ${WRKSRC}/swmbg.1x ${PREFIX}/man/man1/swmbg.1
+#	${INSTALL_MAN} ${WRKSRC}/swm-de.1x \
+#		${PREFIX}/man/de_DE.ISO_8859-1/man1/swm.1x
 	${MKDIR} ${PREFIX}/share/swm
-	${INSTALL_DATA} ${WRKSRC}/share/swm/background.jpg \
-		${PREFIX}/share/swm/background.jpg
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/${DOCDIR}
 	cd ${WRKSRC} && \
diff --git a/x11-wm/swm/distinfo b/x11-wm/swm/distinfo
index 3a3e6f396fda..37dee9bca839 100644
--- a/x11-wm/swm/distinfo
+++ b/x11-wm/swm/distinfo
@@ -1 +1 @@
-MD5 (swm-1.2.1-src.tgz) = 1d64c9c7c3b3ddca160d3af1dd7ef0ae
+MD5 (swm-1.2.2-src.tgz) = 1519428082859f0330c0c364e887f338
diff --git a/x11-wm/swm/files/patch-Makefile b/x11-wm/swm/files/patch-Makefile
index ea86a63d0426..430e0e1d010d 100644
--- a/x11-wm/swm/files/patch-Makefile
+++ b/x11-wm/swm/files/patch-Makefile
@@ -1,22 +1,20 @@
---- Makefile.orig	Thu Dec 14 01:53:57 2000
-+++ Makefile	Sat Dec 16 20:13:38 2000
-@@ -4,14 +4,13 @@
- #MODCC 		= /skiff/local/bin/arm-linux-gcc
- #LDPOSTLIB	= -L/skiff/local/arm-linux/lib
- #LDPOSTLIBS 	= -L/skiff/local/arm-linux/lib
--CC			= gcc
-+CC			?= gcc
- 
- # Only for testing & devellopment
- # CFLAGS   = -O0 -Wall -g3 -p -H 
- # DEFINES  = -DMAXIMIZE -DSHADE -DDRAWTITLE -DSTD_IO -DKEYS -DDEBUG 
+--- Makefile.orig	Tue Jan 30 04:42:53 2001
++++ Makefile	Thu Feb  1 02:21:22 2001
+@@ -6,7 +6,6 @@
+ #DEFINES  = -DFAST
  
  # for modern system, but little amount of memory
--CFLAGS   = -O3 -march=pentium -Wall -shared 
- DEFINES  = -DSHADE -DDRAWTITLE -DSTD_IO -DKEYS -DMAXIMIZE 
+-CFLAGS   = -O3 -march=pentium -Wall -shared
+ DEFINES  = -DSHADE -DDRAWTITLE -DSTD_IO -DKEYS -DMAXIMIZE
+ 
+ # modern system, no keyboard support desired & faster drawing
+@@ -24,12 +23,12 @@
+ 
+ # There should be nothing to edit below this line
+ # -----------------------------------------------------------------------------
+-CC			= gcc
++CC			?= gcc
  
- # for very small computers...
-@@ -24,7 +23,7 @@
  #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 
  
@@ -24,4 +22,4 @@
 +XROOT    = ${X11BASE}
  INCLPATH = -I$(XROOT)/include
  LDPATH   = -L$(XROOT)/lib
- LIBS     = -lXext -lX11  
+