diff options
| author | hq <hq@FreeBSD.org> | 2004-12-22 21:47:26 +0800 |
|---|---|---|
| committer | hq <hq@FreeBSD.org> | 2004-12-22 21:47:26 +0800 |
| commit | 40beae9d2e30fc484da49646fbc076708b1811d8 (patch) | |
| tree | 09fa559bdcb9c92b999b08c874469d6d427900ee | |
| parent | 01388c8ca76a4a5191616ac2bd2a67c50ef3981f (diff) | |
| download | freebsd-ports-gnome-40beae9d2e30fc484da49646fbc076708b1811d8.tar.gz freebsd-ports-gnome-40beae9d2e30fc484da49646fbc076708b1811d8.tar.zst freebsd-ports-gnome-40beae9d2e30fc484da49646fbc076708b1811d8.zip | |
Fix OPTIONS so that it will build on pointyhat. Now, the user may either select
AWT_X, AWT_QT, or neither (this will disable entirely AWT).
Approved by: maintainer
| -rw-r--r-- | java/kaffe-devel/Makefile | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/java/kaffe-devel/Makefile b/java/kaffe-devel/Makefile index a8d63a271960..3834489843de 100644 --- a/java/kaffe-devel/Makefile +++ b/java/kaffe-devel/Makefile @@ -5,12 +5,6 @@ # $FreeBSD$ # -# Configure AWT implementation used (this can be put in make.conf) -# -# KAFFE_AWT = no No AWT classes -# KAFFE_AWT = X X AWT classes -# KAFFE_AWT = QT Qt AWT classes - PORTNAME= kaffe PORTVERSION= 1.1.3 PORTREVISION= 1 @@ -42,38 +36,25 @@ WANT_GNOME= esound MAN1= kaffe.1 -OPTIONS= KAFFE_AWT_X "Use AWT widgets with X" On \ - KAFFE_AWT_QT "Use AWT widgets with Qt" Off \ - KAFFE_AWT_NO "Do not use AWT widgets" Off +OPTIONS= AWT_X "Use AWT widgets with X" On \ + AWT_QT "Use AWT widgets with Qt" Off .include <bsd.port.pre.mk> -.if !defined(WITH_KAFFE_AWT_X) && !defined(WITH_KAFFE_AWT_QT) && !defined(WITH_KAFFE_AWT_NO) -IGNORE= You must choose one of the options in 'make config' to install -.endif - -.if defined(WITH_KAFFE_AWT_X) -. if defined(WITH_KAFFE_AWT_QT) || defined(WITH_KAFFE_AWT_NO) - BROKEN= "Choose only one of the options in 'make config'" +.if defined(WITH_AWT_X) +. if defined(WITH_AWT_QT) + BROKEN= "Choose either 'X' or 'Qt' in 'make config'" . endif CONFIGURE_ARGS+= --with-awt=X USE_XLIB= yes AWT= yes WITH_ESOUND= yes -.endif -.if defined(WITH_KAFFE_AWT_QT) -. if defined(WITH_KAFFE_AWT_X) || defined(WITH_KAFFE_AWT_NO) - BROKEN= "Choose only one of the options in 'make config'" -. endif +.elif defined(WITH_AWT_QT) CONFIGURE_ARGS+= --with-awt=qt --with-qtdir=${X11BASE} AWT= yes USE_QT_VER= 3 WITH_ESOUND= yes -.endif -.if defined(WITH_KAFFE_AWT_NO) -. if defined(WITH_KAFFE_AWT_X) || defined(WITH_KAFFE_AWT_QT) - BROKEN= "Choose only one of the options in 'make config'" -. endif +.else CONFIGURE_ARGS+= --with-awt=no .endif |