summaryrefslogtreecommitdiff
path: root/x11-wm/fvwm2-devel
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2003-11-08 04:35:29 +0000
committerCy Schubert <cy@FreeBSD.org>2003-11-08 04:35:29 +0000
commitc9a49087dbb6b4edcc25c67d8e1b353d5ef67737 (patch)
tree661240e75194d42604e3378adc7613ffdab09a70 /x11-wm/fvwm2-devel
parentUse non-customizeable pathes for warining files (diff)
1. Iconv is required to fix segmentation violations and bus errors,
see http://www.hpc.uh.edu/fvwm/archive/0311/msg00049.html. 2. Use LOCALBASE to locate iconv instead of /usr/local. PR: 59032 (for #1)
Notes
Notes: svn path=/head/; revision=93353
Diffstat (limited to 'x11-wm/fvwm2-devel')
-rw-r--r--x11-wm/fvwm2-devel/Makefile12
1 files changed, 5 insertions, 7 deletions
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 2f527efc0f9e..8f2a5fa7f9cf 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fvwm
PORTVERSION= 2.5.8
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/
@@ -21,7 +22,10 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= cy@FreeBSD.org
COMMENT= Popular virtual window manager for X
-LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/Xft
+CONFIGURE_ARGS= --with-iconv-library=${LOCALBASE}/lib \
+ --with-iconv-includes=${LOCALBASE}/include
+LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/Xft \
+ biconv.2:${PORTSDIR}/converters/iconv
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
.if defined(WITH_STROKE)
@@ -59,12 +63,6 @@ CONFIGURE_ARGS+= --with-png --with-png-includes=${LOCALBASE}/include \
--with-png-library=${LOCALBASE}/lib
.endif
-.if !defined(WITHOUT_ICONV)
-LIB_DEPENDS+= biconv.2:${PORTSDIR}/converters/iconv
-CONFIGURE_ARGS+= --with-iconv-lib=/usr/local/lib \
- --with-iconv-includes=/usr/local/include
-.endif
-
.if defined(WITHOUT_BIDI)
CONFIGURE_ARGS+= --disable-bidi
.endif