diff --git a/x11/slim/Makefile b/x11/slim/Makefile index 07db8d08938d..52209467bebe 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -6,7 +6,7 @@ # PORTNAME= slim -PORTVERSION= 1.2.4 +PORTVERSION= 1.2.6 CATEGORIES= x11 MASTER_SITES= http://download.berlios.de/slim/ \ http://depot.fsck.ch/mirror/distfiles/ @@ -20,7 +20,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ RUN_DEPENDS= ${X11BASE}/bin/X:${X_SERVER_PORT} BUILD_DEPENDS= ${X11BASE}/include/X11/Xft/Xft.h:${PORTSDIR}/x11-fonts/libXft -USE_X_PREFIX= yes USE_XLIB= yes USE_RC_SUBR= slim.sh @@ -29,22 +28,24 @@ MAN1= slim.1 MAKEFILE= Makefile.freebsd pre-build: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ + @${REINPLACE_CMD} \ + -e 's|%%X11BASE%%|${X11BASE}|g' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/Makefile.freebsd \ ${WRKSRC}/slim.conf do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${X11BASE}/bin - @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${X11BASE}/etc/${PORTNAME}.conf.sample - @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${X11BASE}/man/man1 + @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${LOCALBASE}/bin + @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${LOCALBASE}/etc/${PORTNAME}.conf.sample + @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${LOCALBASE}/man/man1 @${MKDIR} ${DATADIR}/themes/default @${INSTALL_DATA} ${WRKSRC}/themes/default/${PORTNAME}.theme ${DATADIR}/themes/default @${INSTALL_DATA} ${WRKSRC}/themes/default/panel.png ${DATADIR}/themes/default @${INSTALL_DATA} ${WRKSRC}/themes/default/background.jpg ${DATADIR}/themes/default post-install: - @if [ ! -f ${X11BASE}/etc/slim.conf ]; then \ - ${CP} -p ${X11BASE}/etc/slim.conf.sample ${X11BASE}/etc/slim.conf ; \ + @if [ ! -f ${LOCALBASE}/etc/slim.conf ]; then \ + ${CP} -p ${LOCALBASE}/etc/slim.conf.sample ${LOCALBASE}/etc/slim.conf ; \ fi .include diff --git a/x11/slim/distinfo b/x11/slim/distinfo index 0f9044cbe853..ceccaa78bcf9 100644 --- a/x11/slim/distinfo +++ b/x11/slim/distinfo @@ -1,3 +1,3 @@ -MD5 (slim-1.2.4.tar.gz) = b4aec9724050cf0fd582f8a39bf30f1e -SHA256 (slim-1.2.4.tar.gz) = 84d0fbbd39d012821de195ee3a14af421a40afc0fb68aaa06dc6c5996ace2a62 -SIZE (slim-1.2.4.tar.gz) = 214449 +MD5 (slim-1.2.6.tar.gz) = 1bf891f046014a03236c21ce6cbe455b +SHA256 (slim-1.2.6.tar.gz) = 4f0a51c88d0d4f942d3552efcfbfcb245bc558336a1ed3f531dbe65252ad8c5e +SIZE (slim-1.2.6.tar.gz) = 219003 diff --git a/x11/slim/files/patch-Makefile.freebsd b/x11/slim/files/patch-Makefile.freebsd index 20f9fd87e32e..692acf3ff1e9 100644 --- a/x11/slim/files/patch-Makefile.freebsd +++ b/x11/slim/files/patch-Makefile.freebsd @@ -1,26 +1,25 @@ ---- Makefile.freebsd.orig Sun Sep 11 18:50:36 2005 -+++ Makefile.freebsd Sun Jan 8 12:17:45 2006 -@@ -3,15 +3,15 @@ +--- Makefile.freebsd.orig Thu Nov 16 17:47:00 2006 ++++ Makefile.freebsd Thu Nov 16 17:57:34 2006 +@@ -3,14 +3,15 @@ # Edit the following section to adjust the options # to fit into your operating system / distribution ####################################################### -CXX=/usr/bin/g++ -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 --CXXLAGS=$(CFLAGS) --LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXpm -lXmu -lpng -ljpeg +-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%%X11BASE%%/include `freetype-config --cflags` `libpng-config --cflags` +CXXLAGS+=$(CFLAGS) -+LDFLAGS=-L%%X11BASE%%/lib `freetype-config --libs` `libpng-config --libs` -lXft -lX11 -lXrender -lfontconfig -lz -lm -lcrypt -lXpm -lXmu -ljpeg ++LDFLAGS=-L%%X11BASE%%/lib `freetype-config --libs` `libpng-config --libs` -lXft -lX11 -lXrender -lfontconfig -lz -lm -lcrypt -lXmu -ljpeg CUSTOM=-DNEEDS_BASENAME -PREFIX=/usr -CFGDIR=/etc -MANDIR=/usr/share/man -+PREFIX=%%X11BASE%% -+CFGDIR=%%X11BASE%%/etc -+MANDIR=%%X11BASE%%/man ++PREFIX=%%LOCALBASE%% ++CFGDIR=%%LOCALBASE%%/etc ++MANDIR=%%LOCALBASE%%/man DESTDIR= ####################################################### diff --git a/x11/slim/files/patch-app.cpp b/x11/slim/files/patch-app.cpp new file mode 100644 index 000000000000..3e48b7b4db91 --- /dev/null +++ b/x11/slim/files/patch-app.cpp @@ -0,0 +1,37 @@ +--- app.cpp.orig Fri Nov 24 16:36:58 2006 ++++ app.cpp Sun Nov 26 23:14:35 2006 +@@ -560,13 +560,6 @@ int App::StartServer() { + } else if (pos == 0) { + server[argc++] = args+pos; + } +- if (server[argc-1][0] == 'v' && server[argc-1][1] == 't') { +- bool ok = false; +- Cfg::string2int(server[argc-1]+2, &ok); +- if (ok) { +- hasVtSet = true; +- } +- } + ++pos; + + if (argc+1 >= MAX_XSERVER_ARGS) { +@@ -576,8 +569,19 @@ int App::StartServer() { + break; + } + } ++ ++ for (int i=0; i