Index: head/x11-wm/swm/Makefile =================================================================== --- head/x11-wm/swm/Makefile (revision 40123) +++ head/x11-wm/swm/Makefile (revision 40124) @@ -1,65 +1,70 @@ # New ports collection makefile for: swm # Date created: 2000-12-16 # Whom: trevor # # $FreeBSD$ # PORTNAME= swm -PORTVERSION= 1.2.2 +PORTVERSION= 1.2.3 CATEGORIES= x11-wm MASTER_SITES= http://www.informatik.hu-berlin.de/~sperling/prog/ EXTRACT_SUFX= -src.tgz MAINTAINER= trevor@FreeBSD.org -BINS= swm swmbg #swmswitch +BINS= swm swmbg swmswitch DOCDIR= share/doc/${PORTNAME} DOCS= AUTHORS COMPILE_PARAMS COPYING ChangeLog LIESMICH README \ - README.iPaq TODO startswm swm.lsm + README.iPaq TODO startswm swm.lsm KNOWN-BUGS swm-de.1x +EXAMPLES= startswm.default startswm.gnome startswm.kde MAN1= swm.1 swmbg.1 PLIST= ${WRKDIR}/pkg-plist SCRIPTS= startswm.default USE_GMAKE= yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src pre-install: ${RM} -f ${PLIST} for i in ${BINS} ${SCRIPTS}; \ do ${ECHO} bin/$${i} >> ${PLIST}; \ done .if !defined(NOPORTDOCS) for i in ${DOCS}; \ do ${ECHO} ${DOCDIR}/$${i} >> ${PLIST}; \ done for i in 1 2 3; \ do ${ECHO} ${DOCDIR}/examples/.swm/button$${i} >> ${PLIST}; \ done + for i in ${EXAMPLES}; \ + do ${ECHO} ${DOCDIR}/examples/$${i} >> ${PLIST}; \ + done ${ECHO} @dirrm ${DOCDIR}/examples/.swm >> ${PLIST} ${ECHO} @dirrm ${DOCDIR}/examples >> ${PLIST} ${ECHO} @dirrm ${DOCDIR} >> ${PLIST} - ${ECHO} @dirrm share/swm >> ${PLIST} .endif 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.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 .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 .endif .include Property changes on: head/x11-wm/swm/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/x11-wm/swm/distinfo =================================================================== --- head/x11-wm/swm/distinfo (revision 40123) +++ head/x11-wm/swm/distinfo (revision 40124) @@ -1 +1 @@ -MD5 (swm-1.2.2-src.tgz) = 1519428082859f0330c0c364e887f338 +MD5 (swm-1.2.3-src.tgz) = d34168f18e723695f670253e15872e52 Property changes on: head/x11-wm/swm/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/x11-wm/swm/files/patch-Makefile =================================================================== --- head/x11-wm/swm/files/patch-Makefile (revision 40123) +++ head/x11-wm/swm/files/patch-Makefile (revision 40124) @@ -1,25 +1,21 @@ ---- Makefile.orig Tue Jan 30 04:42:53 2001 -+++ Makefile Thu Feb 1 02:21:22 2001 -@@ -6,7 +6,6 @@ - #DEFINES = -DFAST +--- Makefile.orig Mon Mar 19 01:54:40 2001 ++++ Makefile Tue Mar 20 12:55:19 2001 +@@ -3,16 +3,15 @@ - # for modern system, but little amount of memory --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 @@ + # Only for testing & devellopment + # CFLAGS = -O0 -Wall -g3 -ggdb -p -H +-CFLAGS = -O3 -s # 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 Property changes on: head/x11-wm/swm/files/patch-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property