Index: head/x11-wm/wmanager/Makefile =================================================================== --- head/x11-wm/wmanager/Makefile (revision 93269) +++ head/x11-wm/wmanager/Makefile (revision 93270) @@ -1,40 +1,40 @@ # New ports collection makefile for: wmanager # Date created: 19 Nov 1999 # Whom: Will Andrews # # $FreeBSD$ # PORTNAME= wmanager PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig MAINTAINER= ports@FreeBSD.org COMMENT= X11 window manager selector LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_X_PREFIX= yes USE_GMAKE= yes MAKE_ENV= CXX="${CXX}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for file in FAQ HISTORY INSTALL NEWS README TODO ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/.wmanagerrc ${EXAMPLESDIR}/wmanagerrc_sample ${INSTALL_DATA} ${WRKSRC}/.xinitrc ${EXAMPLESDIR}/xinitrc_sample .endif .include Property changes on: head/x11-wm/wmanager/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.19 \ No newline at end of property +1.20 \ No newline at end of property Index: head/x11-wm/wmanager/files/patch-aa =================================================================== --- head/x11-wm/wmanager/files/patch-aa (revision 93269) +++ head/x11-wm/wmanager/files/patch-aa (revision 93270) @@ -1,62 +1,62 @@ $FreeBSD$ --- 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 +# base settings +bindir = $(PREFIX)/bin +incdir = ./inc +srcdir = ./src +fltkinc = $(X11BASE)/include +x11lib = $(X11BASE)/lib # compiler settings -CXX = g++ -CXXFLAGS = -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3 - +CXX ?= g++ +CXXFLAGS+= -I$(fltkinc) -I$(incdir) $(PTHREAD_CFLAGS) #-DDEBUG=1 -g3 # linker settings -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) ++LDFLAGS = -lGL -lfltk -lXext -lX11 -lm $(PTHREAD_LIBS) +LDDIRS = -L$(x11lib) # install settings INSTALL = /usr/bin/install @@ -50,17 +54,6 @@ DOCTOOL = perceps DOCTOOL_FLAGS = -a -b -f -h -m -r -# base locations -prefix = /usr/local -exec_prefix = $(prefix) -bindir = $(exec_prefix)/bin - - -# include files and sources -incdir = ./inc -srcdir = ./src - - # documentational files for developer docdir = ./doc templates = $(docdir)/templates @@ -82,8 +75,7 @@ # project version VERSION = 0.1.1 - -all: wmanager TAGS +all: wmanager wmanager: $(OBJ) $(LD) -o $@ $^ $(LDDIRS) $(LDFLAGS) Property changes on: head/x11-wm/wmanager/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property