summaryrefslogtreecommitdiff
path: root/x11-wm/flwm
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2008-12-07 21:25:30 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2008-12-07 21:25:30 +0000
commit88a73597b922da94dbdb1e747af0e81ac9bde631 (patch)
treee5e925219104faa83b4296cf545b3206fd2806bf /x11-wm/flwm
parent- Few words on the recent php5 update (diff)
- Update to 1.02
- Take maintainship Thanks to: miwi@ for resurrecting the port
Notes
Notes: svn path=/head/; revision=223974
Diffstat (limited to 'x11-wm/flwm')
-rw-r--r--x11-wm/flwm/Makefile26
-rw-r--r--x11-wm/flwm/files/patch-Rotated.C14
2 files changed, 21 insertions, 19 deletions
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile
index 0616386ec737..c0e06cae151d 100644
--- a/x11-wm/flwm/Makefile
+++ b/x11-wm/flwm/Makefile
@@ -6,34 +6,22 @@
#
PORTNAME= flwm
-PORTVERSION= 1.00
-PORTREVISION= 2
+PORTVERSION= 1.02
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= gj
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= gahr@FreeBSD.org
COMMENT= The Fast Light Window Manager
-DEPRECATED= Project is dead, and uses obsolete version of fltk
-EXPIRATION_DATE= 2008-10-19
-
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
-MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS}
-
GNU_CONFIGURE= yes
+
MAN1= flwm.1
PLIST_FILES= bin/flwm
-.include <bsd.port.pre.mk>
-
-# could be a problem if both versions of freetype are installed
-.if exists(${LOCALBASE}/include/freetype1/freetype/freetype.h)
-CONFIGURE_ARGS= --includedir="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype1"
-.elif exists(${LOCALBASE}/include/freetype2/freetype/freetype.h)
-CONFIGURE_ARGS= --includedir="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2"
-.endif
+post-patch:
+ ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/flwm/files/patch-Rotated.C b/x11-wm/flwm/files/patch-Rotated.C
new file mode 100644
index 000000000000..8150bcf971a2
--- /dev/null
+++ b/x11-wm/flwm/files/patch-Rotated.C
@@ -0,0 +1,14 @@
+--- Rotated.C.orig 2008-12-07 22:19:57.000000000 +0100
++++ Rotated.C 2008-12-07 22:20:12.000000000 +0100
+@@ -368,9 +368,11 @@
+ }
+
+ void draw_rotated(const char* text, int n, int x, int y, int angle) {
++#if 0
+ if (!text || !*text) return;
+ setrotfont(angle);
+ XRotDrawString(fl_display, font, fl_window, fl_gc, x, y, text, n);
++#endif
+ }
+
+ #if !defined(FLWM) || FL_MAJOR_VERSION>=2