diff options
| -rw-r--r-- | x11-wm/wmanager/Makefile | 26 | ||||
| -rw-r--r-- | x11-wm/wmanager/distinfo | 2 | ||||
| -rw-r--r-- | x11-wm/wmanager/files/patch-aa | 11 |
3 files changed, 16 insertions, 23 deletions
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile index 76b0c021c618..63fc19173f34 100644 --- a/x11-wm/wmanager/Makefile +++ b/x11-wm/wmanager/Makefile @@ -6,40 +6,32 @@ # PORTNAME= wmanager -PORTVERSION= 0.2 +PORTVERSION= 0.2.1 CATEGORIES= x11-wm MASTER_SITES= http://kassandra.techfak.uni-bielefeld.de/mtessmer/wmanager/ -EXTRACT_SUFX= .src.tar.bz2 +EXTRACT_SUFX= -src.tar.bz2 MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk/ - -WRKSRC= ${WRKDIR}/${PORTNAME} +LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +MAKE_ENV= CXX="${CXX}" \ + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${PREFIX}/bin .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/examples/${PORTNAME} @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/.wmanagerrc \ - ${PREFIX}/share/examples/${PORTNAME}/wmanagerrc_sample - @${INSTALL_DATA} ${WRKSRC}/.xinitrc \ - ${PREFIX}/share/examples/${PORTNAME}/xinitrc_sample .for file in FAQ HISTORY INSTALL NEWS README TODO - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor - @${ECHO} "" - @${ECHO} "Examples of .xinitrc and .wmanagerrc have been installed" - @${ECHO} "in ${PREFIX}/share/examples/${PORTNAME} and docs have" - @${ECHO} "been installed to ${DOCSDIR}." - @${ECHO} "" + @${MKDIR} ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/.wmanagerrc ${EXAMPLESDIR}/wmanagerrc_sample + ${INSTALL_DATA} ${WRKSRC}/.xinitrc ${EXAMPLESDIR}/xinitrc_sample .endif .include <bsd.port.mk> diff --git a/x11-wm/wmanager/distinfo b/x11-wm/wmanager/distinfo index 0f02932f4ca9..5602d89ee748 100644 --- a/x11-wm/wmanager/distinfo +++ b/x11-wm/wmanager/distinfo @@ -1 +1 @@ -MD5 (wmanager-0.2.src.tar.bz2) = 29b00db8ad366fec9211cac3931cf2a0 +MD5 (wmanager-0.2.1-src.tar.bz2) = 9cb3ee252d893d869af9c7079d1d8e31 diff --git a/x11-wm/wmanager/files/patch-aa b/x11-wm/wmanager/files/patch-aa index 29b21dff5349..ab890ad02ae8 100644 --- a/x11-wm/wmanager/files/patch-aa +++ b/x11-wm/wmanager/files/patch-aa @@ -1,8 +1,8 @@ $FreeBSD$ ---- Makefile.orig Sun Nov 14 17:29:24 1999 -+++ Makefile Tue Aug 14 13:08:36 2001 +--- Makefile.orig Mon Nov 15 00:29:24 1999 ++++ Makefile Sat Oct 26 06:02:46 2002 @@ -29,17 +29,21 @@ SHELL = /bin/sh MAKEFLAGS = --print-directory @@ -18,16 +18,17 @@ $FreeBSD$ -CXX = g++ -CXXFLAGS = -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3 - -+CXX = g++ ++CXX ?= g++ +CXXFLAGS+= -I$(fltkinc) -I$(incdir) -Wall -pedantic $(PTHREAD_CFLAGS) #-DDEBUG=1 -g3 # linker settings - LD = g++ +-LD = g++ -LDFLAGS = -lfltk -lXext -lX11 -lm -LDDIRS = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib - ++LD = $(CXX) +LDFLAGS = -lMesaGL -lfltk -lXext -lX11 -lm $(PTHREAD_LIBS) -+LDDIRS = -L$(x11lib) -L/usr/lib -L/usr/local/lib ++LDDIRS = -L$(x11lib) # install settings INSTALL = /usr/bin/install |