ports/155856: Update port: x11-wm/swm to 1.3.4c
KATO Tsuguru
tkato432 at yahoo.com
Tue Mar 22 18:20:25 UTC 2011
>Number: 155856
>Category: ports
>Synopsis: Update port: x11-wm/swm to 1.3.4c
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 22 18:20:25 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.3-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 1.3.4c
Remove file:
files/patch-swm.conf
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-wm/swm/Makefile x11-wm/swm/Makefile
--- /usr/ports/x11-wm/swm/Makefile 2011-03-12 20:55:02.000000000 +0900
+++ x11-wm/swm/Makefile 2011-03-23 02:40:51.000000000 +0900
@@ -6,79 +6,71 @@
#
PORTNAME= swm
-PORTVERSION= 1.3.4
-PORTREVISION= 4
+PORTVERSION= 1.3.4c
CATEGORIES= x11-wm
-MASTER_SITES= http://www2.informatik.hu-berlin.de/~sperling/prog/
-EXTRACT_SUFX= c-src.tgz
+MASTER_SITES= http://www.small-window-manager.de/
+EXTRACT_SUFX= -src.tgz
MAINTAINER= ports at FreeBSD.org
COMMENT= Window manager for low-memory systems, with title bars and shading
-DEPRECATED= Upstream disapear and distfile is no more available
-EXPIRATION_DATE= 2011-05-01
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/../doc/COPYING
-BINS= swm swmbg swmswitch
-DOCDIR= share/doc/${PORTNAME}
-MAN1= swm.1 swmbg.1
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S,c,,}/src
+
+USE_XORG= xpm
+USE_GMAKE= yes
MAKEFILE= Makefile-xpm
-PLIST= ${WRKDIR}/pkg-plist
-PLIST_DIRS= share/swm/pixmaps share/swm
+MAKE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="" CC="${CC}" XROOT="${LOCALBASE}"
+
+MANLANG= "" de
+MAN1= swm.1 swmbg.1 swmswitch.1
+PORTDOCS= *
+PORTEXAMPLES= * .swm
+PLIST_FILES= ${BINS:S,^,bin/,} ${SCRIPTS:S,^,bin/,} \
+ ${DATA:S,^,%%DATADIR%%/pixmaps/,}
+PLIST_DIRS= %%DATADIR%%/pixmaps %%DATADIR%%
+
+BINS= swm swmbg swmswitch
SCRIPTS= startswm
-USE_GMAKE= yes
-USE_XORG= x11 xext xpm
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+DATA= background.xpm closebox.xpm maxbox.xpm stickybox.xpm \
+ swm.colors unstickybox.xpm
post-patch:
-.for ii in init.c swm.conf
- ${MV} ${WRKSRC}/${ii} ${WRKSRC}/${ii}.orig
- ${SED} -e "s:PREFIX:${PREFIX}:g" \
- < ${WRKSRC}/${ii}.orig > ${WRKSRC}/${ii}
+.for file in init.c swm.conf
+ @${REINPLACE_CMD} -e 's|monotype|fixed|g ; \
+ s|/usr/share|${PREFIX}/share|g' ${WRKSRC}/${file}
.endfor
post-build:
- cd ${WRKSRC}/../swmbg && ${CC} ${CFLAGS} -I${LOCALBASE}/include *.c \
- -o ${WRKSRC}/swmbg -lX11 -lXext -lXpm -L${LOCALBASE}/lib
- cd ${WRKSRC}/../swmswitch && ${CC} ${CFLAGS} -I${LOCALBASE}/include *.c \
- -o ${WRKSRC}/swmswitch -lX11 -L${LOCALBASE}/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
- 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
+ cd ${WRKSRC}/../swmbg && ${CC} ${CFLAGS} -I${LOCALBASE}/include \
+ *.c -o ${WRKSRC}/swmbg -lX11 -lXext -lXpm -L${LOCALBASE}/lib
+ cd ${WRKSRC}/../swmswitch && ${CC} ${CFLAGS} -I${LOCALBASE}/include \
+ *.c -o ${WRKSRC}/swmswitch -lX11 -L${LOCALBASE}/lib
do-install:
- for i in ${BINS}; \
- do ${INSTALL_PROGRAM} ${WRKSRC}/$${i} ${PREFIX}/bin; \
- done
- ${INSTALL_SCRIPT} ${WRKSRC}/${SCRIPTS} ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/swm.1x ${PREFIX}/man/man1/swm.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
+.for file in ${BINS}
+ ${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
+.endfor
+.for file in ${SCRIPTS}
+ ${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/bin
+.endfor
+ ${INSTALL_MAN} ${WRKSRC}/swm.1x ${MANPREFIX}/man/man1/swm.1
+ ${INSTALL_MAN} ${WRKSRC}/swm-de.1x ${MANPREFIX}/man/de/man1/swm.1
+ ${INSTALL_MAN} ${WRKSRC}/../swmbg/swmbg.1x ${MANPREFIX}/man/man1/swmbg.1
+ ${INSTALL_MAN} ${WRKSRC}/../swmbg/swmbg-de.1x ${MANPREFIX}/man/de/man1/swmbg.1
+ ${INSTALL_MAN} ${WRKSRC}/../swmswitch/swmswitch.1x ${MANPREFIX}/man/man1/swmswitch.1
+ ${INSTALL_MAN} ${WRKSRC}/../swmswitch/swmswitch-de.1x ${MANPREFIX}/man/de/man1/swmswitch.1
+ @${MKDIR} ${DATADIR}
+ @cd ${WRKSRC}/../share/swm && ${COPYTREE_SHARE} pixmaps ${DATADIR}
.if !defined(NOPORTDOCS)
- ${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}
+ @${MKDIR} ${DOCSDIR}
+ @cd ${WRKSRC}/../doc && ${COPYTREE_SHARE} . ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
+ @${MKDIR} ${EXAMPLESDIR}
+ @cd ${WRKSRC}/../examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
.endif
- ${MKDIR} ${DATADIR}/pixmaps
- cd ${WRKSRC}/../share/swm/pixmaps && ${PAX} -r -w * ${DATADIR}/pixmaps
.include <bsd.port.mk>
diff -urN /usr/ports/x11-wm/swm/files/patch-Makefile-xpm x11-wm/swm/files/patch-Makefile-xpm
--- /usr/ports/x11-wm/swm/files/patch-Makefile-xpm 2008-04-20 10:22:29.000000000 +0900
+++ x11-wm/swm/files/patch-Makefile-xpm 1970-01-01 09:00:00.000000000 +0900
@@ -1,30 +0,0 @@
---- Makefile-xpm.orig Fri Nov 24 17:15:55 2006
-+++ Makefile-xpm Fri Nov 24 17:16:17 2006
-@@ -2,7 +2,7 @@
- # CFLAGS = -O0 -Wall -g3 -ggdb -p
- # LDFLAGS = -O0 -Wall -g3 -ggdb -p
- #for production use
--CFLAGS = -O3
-+#CFLAGS = -O3
- LDFLAGS = -s -pipe
-
- # if you want swm to be installed somewhere else:
-@@ -10,9 +10,9 @@
-
- # There should be nothing to edit below this line
- # -----------------------------------------------------------------------------
--CC = gcc
-+#CC = gcc
-
--XROOT = /usr/X11R6
-+XROOT = $(LOCALBASE)
- INCLPATH = -I$(XROOT)/include
- LDPATH = -L$(XROOT)/lib
-
-@@ -92,4 +92,4 @@
- mrproper:
- rm -f *~ swm core *.o $(OBJS)
- cp -f Makefile.org Makefile
--
-\ No newline at end of file
-+
diff -urN /usr/ports/x11-wm/swm/files/patch-swm.conf x11-wm/swm/files/patch-swm.conf
--- /usr/ports/x11-wm/swm/files/patch-swm.conf 2002-04-02 12:02:42.000000000 +0900
+++ x11-wm/swm/files/patch-swm.conf 1970-01-01 09:00:00.000000000 +0900
@@ -1,20 +0,0 @@
---- 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"
diff -urN /usr/ports/x11-wm/swm/pkg-descr x11-wm/swm/pkg-descr
--- /usr/ports/x11-wm/swm/pkg-descr 2003-11-14 12:03:30.000000000 +0900
+++ x11-wm/swm/pkg-descr 2011-03-12 23:41:39.000000000 +0900
@@ -1,13 +1,6 @@
-from the Web page:
+sWM was written for small computer system with very little amount of
+memory and small screen sizes. It was written to speed up working with
+laptops or even PDA's. You need a minimum of about 12k of diskspace
+(minimal mode). It uses even less memory than a rxvt.
- SWM was written for small computer systems with very little
- memory and small screen sizes. It was written to speed up
- working with laptops or even PDAs. You need a minimum of
- about 20 kB of diskspace. It uses even less memory than
- rxvt.
-
-The swmswitch command crashes, so it is not installed.
-
-WWW: http://www.informatik.hu-berlin.de/~sperling/prog/swm.html
-
-Trevor Johnson
+WWW: http://www.small-window-manager.de/
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list