diff options
| -rw-r--r-- | x11/slim/Makefile | 2 | ||||
| -rw-r--r-- | x11/slim/files/patch-Makefile.freebsd | 37 | ||||
| -rw-r--r-- | x11/slim/files/patch-PAM.cpp | 11 |
3 files changed, 37 insertions, 13 deletions
diff --git a/x11/slim/Makefile b/x11/slim/Makefile index 3c9ab20fae1a..2916f1ace16e 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -7,7 +7,7 @@ PORTNAME= slim PORTVERSION= 1.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_BERLIOS} \ http://depot.fsck.ch/mirror/distfiles/ diff --git a/x11/slim/files/patch-Makefile.freebsd b/x11/slim/files/patch-Makefile.freebsd index c10620910b37..50f75850d6c5 100644 --- a/x11/slim/files/patch-Makefile.freebsd +++ b/x11/slim/files/patch-Makefile.freebsd @@ -1,6 +1,6 @@ ---- Makefile.freebsd.orig Sun Jul 15 16:09:28 2007 -+++ Makefile.freebsd Wed Jul 18 20:23:58 2007 -@@ -3,18 +3,18 @@ +--- Makefile.freebsd.orig 2007-07-15 17:09:28.000000000 +0300 ++++ Makefile.freebsd 2008-05-13 11:56:53.000000000 +0300 +@@ -3,18 +3,14 @@ # Edit the following section to adjust the options # to fit into your operating system / distribution ####################################################### @@ -8,21 +8,34 @@ -CC=/usr/bin/gcc -CFLAGS=-I. -I/usr/X11R6/include -I/usr/local/include/freetype2 -I/usr/local/include/freetype2/config -I/usr/local/include/libpng -I/usr/local/include -I/usr/include -LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg -+CXX?=/usr/bin/g++ -+CC?=/usr/bin/gcc -+CFLAGS+=-I${LOCALBASE}/include `freetype-config --cflags` `libpng-config --cflags` -+LDFLAGS=-L${LOCALBASE}/lib `freetype-config --libs` `libpng-config --libs` -lXft -lX11 -lXrender -lfontconfig -lz -lm -lcrypt -lXmu -ljpeg - CUSTOM=-DNEEDS_BASENAME - .ifdef(USE_PAM) - LDFLAGS+= -lpam - CUSTOM+= -DUSE_PAM - .endif +-CUSTOM=-DNEEDS_BASENAME +-.ifdef(USE_PAM) +- LDFLAGS+= -lpam +- CUSTOM+= -DUSE_PAM +-.endif -PREFIX=/usr -CFGDIR=/etc -MANDIR=/usr/share/man ++CXX?=/usr/bin/g++ ++CC?=/usr/bin/gcc ++CFLAGS+=-I${LOCALBASE}/include `freetype-config --cflags` `libpng-config --cflags` ++LDFLAGS=-L${LOCALBASE}/lib `freetype-config --libs` `libpng-config --libs` -lXft -lX11 -lXrender -lfontconfig -lz -lm -lcrypt -lXmu -ljpeg -lpam ++CUSTOM=-DNEEDS_BASENAME -DUSE_PAM +PREFIX?=${LOCALBASE} +CFGDIR=$(PREFIX)/etc +MANDIR=$(MANPREFIX)/man DESTDIR= ####################################################### +@@ -24,10 +20,7 @@ + DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \ + -DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\" + +-OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o +-.ifdef USE_PAM +- OBJECTS+=PAM.o +-.endif ++OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o PAM.o + + all: slim + diff --git a/x11/slim/files/patch-PAM.cpp b/x11/slim/files/patch-PAM.cpp new file mode 100644 index 000000000000..a32d7d8dea45 --- /dev/null +++ b/x11/slim/files/patch-PAM.cpp @@ -0,0 +1,11 @@ +--- PAM.cpp.orig 2008-05-13 12:04:37.000000000 +0300 ++++ PAM.cpp 2008-05-13 12:04:45.000000000 +0300 +@@ -6,7 +6,7 @@ + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + */ +-#include <PAM.h> ++#include "PAM.h" + #include <string> + #include <iostream> + |