Date: Mon, 27 Aug 2001 14:32:37 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/30147: Update port: x11-wm/qlwm to 2.6 Message-ID: <200108272132.f7RLWbv69969@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 30147 >Category: ports >Synopsis: Update port: x11-wm/qlwm to 2.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Aug 27 14:40:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.3-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2.6 Remove file: files/patch-dclock_Makefile files/patch-mail_Makefile files/patch-src_Makefile >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-wm/qlwm/Makefile x11-wm/qlwm/Makefile --- /usr/ports/x11-wm/qlwm/Makefile Tue Apr 10 14:02:27 2001 +++ x11-wm/qlwm/Makefile Sun Aug 19 07:52:42 2001 @@ -8,28 +8,32 @@ # PORTNAME= qlwm -PORTVERSION= 2.3 +PORTVERSION= 2.6 CATEGORIES= x11-wm MASTER_SITES= http://www.netcologne.de/~nc-lindenal/qlwm/ MAINTAINER= trevor@FreeBSD.org -DOCDIR= share/doc/qlwm +DOCDIR= share/doc/${PORTNAME} DOCS= CHANGES README -LIBDIR= lib/qlwm +LIBDIR= lib/${PORTNAME} PLIST= ${WRKDIR}/pkg-plist MAN1= qlwm.1 USE_QT_VER= 2 USE_X_PREFIX= yes -MAKE_ENV= LFLAGS="-L${X11BASE}/lib -L${X11BASE}/lib/qt2" \ - QTDIR=${X11BASE} \ - DEST=${PREFIX}/${LIBDIR} +MAKE_ENV= DEST="${PREFIX}/${LIBDIR}" INCPATH="${QTCPPFLAGS}" \ + LIBS="${QTCFGLIBS} -l${QTNAME}" LINK="${CXX}" MOC="${MOC}" post-patch: - ${PERL} -pi -e "s:/usr/local/qlwm:${PREFIX}/${LIBDIR}:g" ${WRKSRC}/Makefile - ${PERL} -pi -e "s:-lqt:-lqt2:g ; s:bin/moc:bin/moc2:g" \ - ${WRKSRC}/*/Makefile + find ${WRKSRC} -name "Makefile" | xargs ${PERL} -pi -e \ + 's|/usr/local/qlwm|${PREFIX}/${LIBDIR}|g ; \ + s|^CXX|#CXX|g ; \ + s|^INCPATH|#INCPATH|g ; \ + s|^LFLAGS|#LFLAGS|g ; \ + s|^LIBS|#LIBS|g ; \ + s|^LINK|#LINK|g ; \ + s|^MOC|#MOC|g' pre-install: ${ECHO} bin/qlwm > ${PLIST} diff -urN /usr/ports/x11-wm/qlwm/distinfo x11-wm/qlwm/distinfo --- /usr/ports/x11-wm/qlwm/distinfo Tue Apr 10 14:02:27 2001 +++ x11-wm/qlwm/distinfo Sun Aug 19 06:35:48 2001 @@ -1 +1 @@ -MD5 (qlwm-2.3.tar.gz) = 8932b8d98cf8554dc7016dfbe26a22f9 +MD5 (qlwm-2.6.tar.gz) = 535344b6c165679c77b6d9d45dbc6e31 diff -urN /usr/ports/x11-wm/qlwm/files/patch-dclock_Makefile x11-wm/qlwm/files/patch-dclock_Makefile --- /usr/ports/x11-wm/qlwm/files/patch-dclock_Makefile Fri Jan 26 12:34:34 2001 +++ x11-wm/qlwm/files/patch-dclock_Makefile Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- dclock/Makefile.orig Tue Oct 17 05:05:22 2000 -+++ dclock/Makefile Thu Jan 25 16:52:37 2001 -@@ -6,7 +6,7 @@ - #CXXFLAGS = -Wall -pipe - - # include files --INCPATH = -I$(QTDIR)/include -+INCPATH = -I$(QTDIR)/include -I${X11BASE}/include/qt2 - - # libraries - LFLAGS = -L$(QTDIR)/lib diff -urN /usr/ports/x11-wm/qlwm/files/patch-mail_Makefile x11-wm/qlwm/files/patch-mail_Makefile --- /usr/ports/x11-wm/qlwm/files/patch-mail_Makefile Fri Jan 26 12:34:34 2001 +++ x11-wm/qlwm/files/patch-mail_Makefile Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- mail/Makefile.orig Tue Oct 17 05:05:20 2000 -+++ mail/Makefile Thu Jan 25 16:52:45 2001 -@@ -8,7 +8,7 @@ - #CXXFLAGS = -Wall -pipe - - # include files --INCPATH = -I$(QTDIR)/include -+INCPATH = -I${X11BASE}/include/qt2 -I${X11BASE}/include - - # libraries - LFLAGS = -L$(QTDIR)/lib diff -urN /usr/ports/x11-wm/qlwm/files/patch-src_Makefile x11-wm/qlwm/files/patch-src_Makefile --- /usr/ports/x11-wm/qlwm/files/patch-src_Makefile Fri Jan 26 12:34:34 2001 +++ x11-wm/qlwm/files/patch-src_Makefile Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- src/Makefile.orig Tue Oct 17 05:05:22 2000 -+++ src/Makefile Thu Jan 25 16:54:44 2001 -@@ -7,7 +7,7 @@ - #CXXFLAGS = -pipe -DDEBUGMSG - - # include files --INCPATH = -I/usr/X11R6/include -I$(QTDIR)/include -+INCPATH= -I${X11BASE}/include/qt2 -I${X11BASE}/include - - # libraries - LFLAGS = -L/usr/X11R6/lib -L$(QTDIR)/lib -@@ -30,7 +30,7 @@ - .SUFFIXES: .cpp - - .cpp.o: -- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< -+ $(CXX) $(CXXFLAGS) $(INCPATH) -o $@ -c $< - - ####### Build rules - diff -urN /usr/ports/x11-wm/qlwm/files/qlwm x11-wm/qlwm/files/qlwm --- /usr/ports/x11-wm/qlwm/files/qlwm Fri Jan 26 12:34:34 2001 +++ x11-wm/qlwm/files/qlwm Sun Aug 19 09:09:45 2001 @@ -3,6 +3,6 @@ if ! test -e $HOME/.qlwm then mkdir -p $HOME/.qlwm - cp ${PREFIX}/lib/qlwm/files/{defaults,appdefaults,menuconfig} $HOME/.qlwm + for i in defaults appdefaults menuconfig; do cp ${PREFIX}/lib/qlwm/files/$i $HOME/.qlwm; done fi exec ${PREFIX}/lib/qlwm/qlwm "$@" >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200108272132.f7RLWbv69969>