cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add pam support

Browse Source 
PR:		124345
Submitted by:	Tobias Roth <ports@fsck.ch> (maintainer)
This commit is contained in:
Martin Wilke 2008-06-19 12:14:29 +00:00
parent 65bd48dc41
commit 0401d7f4f9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=215266
3 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11/slim/Makefile
View File

@ -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/

37
x11/slim/files/patch-Makefile.freebsd
View File

@ -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

11
x11/slim/files/patch-PAM.cpp Normal file
View File

@ -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>