aboutsummaryrefslogtreecommitdiff
path: root/x11-clocks
diff options
context:
space:
mode:
Diffstat (limited to 'x11-clocks')
-rw-r--r--x11-clocks/abclock/files/patch-Makefile4
-rw-r--r--x11-clocks/alltraxclock/Makefile2
-rw-r--r--x11-clocks/asclock-gtk/Makefile3
-rw-r--r--x11-clocks/asclock-xlib/Makefile6
-rw-r--r--x11-clocks/astime/Makefile2
-rw-r--r--x11-clocks/astzclock/Makefile2
-rw-r--r--x11-clocks/bmp-alarm/Makefile2
-rw-r--r--x11-clocks/emiclock/Makefile6
-rw-r--r--x11-clocks/gdesklets-clock/Makefile4
-rw-r--r--x11-clocks/gdesklets-countdown/Makefile4
-rw-r--r--x11-clocks/gdesklets-ebichuclock/Makefile4
-rw-r--r--x11-clocks/glclock/Makefile4
-rw-r--r--x11-clocks/mlclock/Makefile4
-rw-r--r--x11-clocks/osdclock/Makefile4
-rw-r--r--x11-clocks/pclock/Makefile4
-rw-r--r--x11-clocks/washerdryer/files/patch-Makefile2
-rw-r--r--x11-clocks/wmbday/Makefile2
-rw-r--r--x11-clocks/wmbinclock/Makefile2
-rw-r--r--x11-clocks/wmblueclock/files/patch-Makefile4
-rw-r--r--x11-clocks/wmcalclock/files/patch-aa4
-rw-r--r--x11-clocks/wmclock/Makefile2
-rw-r--r--x11-clocks/wmdate/Makefile2
-rw-r--r--x11-clocks/wmitime/files/patch-aa4
-rw-r--r--x11-clocks/wmtime/Makefile2
-rw-r--r--x11-clocks/wmtimer/files/patch-wmtimer::Makefile2
-rw-r--r--x11-clocks/wmtz/Makefile11
-rw-r--r--x11-clocks/xmms-alarm/Makefile2
-rw-r--r--x11-clocks/xtu/Makefile2
28 files changed, 48 insertions, 48 deletions
diff --git a/x11-clocks/abclock/files/patch-Makefile b/x11-clocks/abclock/files/patch-Makefile
index 7d51d48d60aa..00c7f758bb4c 100644
--- a/x11-clocks/abclock/files/patch-Makefile
+++ b/x11-clocks/abclock/files/patch-Makefile
@@ -12,14 +12,14 @@
-XLIBDIR = -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/X11R5/lib -L/usr/X11R4/lib \
- -L/usr/lib/X11 -L/usr/lib/X11R6 -L/usr/lib/X11R5 -L/usr/lib/X11R4
-+XLIBDIR = -L$(X11BASE)/lib
++XLIBDIR = -L$(LOCALBASE)/lib
-XINCLUDEDIR = -I/usr/X11/include -I/usr/X11R6/include -I/usr/X11R5/include -I/usr/X11R4/include \
- -I/usr/include/X11 -I/usr/include/X11R6 -I/usr/include/X11R5 -I/usr/include/X11R4 \
- -I/usr/local/X11/include -I/usr/local/X11R6/include -I/usr/local/X11R5/include -I/usr/local/X11R4/include \
- -I/usr/local/include/X11 -I/usr/local/include/X11R6 -I/usr/local/include/X11R5 -I/usr/local/include/X11R4 \
- -I/usr/X386/include -I/usr/x386/include -I/usr/XFree86/include/X11 -I/usr/local/x11r5/include
-+XINCLUDEDIR = -I$(X11BASE)/include
++XINCLUDEDIR = -I$(LOCALBASE)/include
all: abclock abc_img
diff --git a/x11-clocks/alltraxclock/Makefile b/x11-clocks/alltraxclock/Makefile
index 595044c0c4c5..0d2d0a27fe64 100644
--- a/x11-clocks/alltraxclock/Makefile
+++ b/x11-clocks/alltraxclock/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}2_0.2-1
MAINTAINER= novel@FreeBSD.org
COMMENT= An analog clock plugin for gkrellm2
-BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
ALL_TARGET= alltraxclock.so
diff --git a/x11-clocks/asclock-gtk/Makefile b/x11-clocks/asclock-gtk/Makefile
index c1334f9617fb..4e29cb0b37be 100644
--- a/x11-clocks/asclock-gtk/Makefile
+++ b/x11-clocks/asclock-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asclock-gtk
PORTVERSION= 2.1.10
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-clocks afterstep windowmaker
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= kuriyama
@@ -19,6 +19,7 @@ COMMENT= New flavor of asclock (GTK version)
WRKSRC= ${WRKDIR}/${PORTNAME}
ALL_TARGET= asclock
+USE_XORG= x11 xt
USE_GNOME= gtk12
HAS_CONFIGURE= yes
diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile
index 6f6ec275f1d8..d2bf127fd851 100644
--- a/x11-clocks/asclock-xlib/Makefile
+++ b/x11-clocks/asclock-xlib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asclock-xlib
PORTVERSION= 2.0.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-clocks afterstep windowmaker
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= kuriyama
@@ -16,12 +16,12 @@ MAINTAINER= kuriyama@FreeBSD.org
COMMENT= New flavor of asclock
WRKSRC= ${WRKDIR}/asclock-xlib
-USE_XPM= YES
+USE_XORG= xpm
.if defined(BATCH)
USE_IMAKE= YES
.else
-USE_X_PREFIX= YES
+USE_XORG= x11
HAS_CONFIGURE= YES
.endif
diff --git a/x11-clocks/astime/Makefile b/x11-clocks/astime/Makefile
index 9a056f4e47ec..33c9710fda67 100644
--- a/x11-clocks/astime/Makefile
+++ b/x11-clocks/astime/Makefile
@@ -17,7 +17,7 @@ COMMENT= Time/Date applet for WindowMaker
USE_XORG= xpm
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-xpm-library="${X11BASE}/lib" --with-xpm-includes="${X11BASE}/include/X11"
+CONFIGURE_ARGS+=--with-xpm-library="${LOCALBASE}/lib" --with-xpm-includes="${LOCALBASE}/include/X11"
INSTALL_TARGET= install install.man
MAN1= astime.1
diff --git a/x11-clocks/astzclock/Makefile b/x11-clocks/astzclock/Makefile
index 62a9e4eda4e7..f7755eb75d3d 100644
--- a/x11-clocks/astzclock/Makefile
+++ b/x11-clocks/astzclock/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= glewis@FreeBSD.org
COMMENT= Afterstep clock with some timezone extensions
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN1= astzclock.1
PLIST_FILES= bin/astzclock
diff --git a/x11-clocks/bmp-alarm/Makefile b/x11-clocks/bmp-alarm/Makefile
index c2edb024351b..3d80109b6d38 100644
--- a/x11-clocks/bmp-alarm/Makefile
+++ b/x11-clocks/bmp-alarm/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
PLIST_FILES= lib/bmp/General/libalarm.so
-# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/bmp/General
+# This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/bmp/General
do-install:
${INSTALL_DATA} ${WRKSRC}/src/.libs/libalarm.so ${PREFIX}/lib/bmp/General
diff --git a/x11-clocks/emiclock/Makefile b/x11-clocks/emiclock/Makefile
index af585fe9d767..e7358738cf33 100644
--- a/x11-clocks/emiclock/Makefile
+++ b/x11-clocks/emiclock/Makefile
@@ -18,9 +18,9 @@ USE_IMAKE= yes
MAN1= emiclock.1
LANGRES= resources/R6/EUC/EmiClock.ad
-LANGDIR= ${X11BASE}/lib/X11/ja_JP.eucJP/app-defaults
-LANGDIR2= ${X11BASE}/lib/X11/ja_JP.EUC/app-defaults
-EMICLOCKDIR= ${X11BASE}/lib/X11/EmiClock
+LANGDIR= ${LOCALBASE}/lib/X11/ja_JP.eucJP/app-defaults
+LANGDIR2= ${LOCALBASE}/lib/X11/ja_JP.EUC/app-defaults
+EMICLOCKDIR= ${LOCALBASE}/lib/X11/EmiClock
PORTDOCS= COPYRIGHT COPYRIGHT.en
.include <bsd.port.pre.mk>
diff --git a/x11-clocks/gdesklets-clock/Makefile b/x11-clocks/gdesklets-clock/Makefile
index 8761fdacc93d..72a149ce72c4 100644
--- a/x11-clocks/gdesklets-clock/Makefile
+++ b/x11-clocks/gdesklets-clock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clock
PORTVERSION= 0.32
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-clocks gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
@@ -20,7 +20,7 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets
USE_BZIP2= yes
USE_PYTHON= yes
-USE_XLIB= yes
+USE_XORG= x11
NAME= Clock
DATADIR= ${PREFIX}/share
diff --git a/x11-clocks/gdesklets-countdown/Makefile b/x11-clocks/gdesklets-countdown/Makefile
index 8e032390c8d0..664800e9c2b2 100644
--- a/x11-clocks/gdesklets-countdown/Makefile
+++ b/x11-clocks/gdesklets-countdown/Makefile
@@ -7,7 +7,7 @@
PORTNAME= countdown
PORTVERSION= 0.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-clocks gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
@@ -19,7 +19,7 @@ COMMENT= Countdown the remaining time until a configurable date
RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets
USE_BZIP2= yes
-USE_XLIB= yes
+USE_XORG= x11
USE_PYTHON= yes
NAME= Countdown
diff --git a/x11-clocks/gdesklets-ebichuclock/Makefile b/x11-clocks/gdesklets-ebichuclock/Makefile
index ec65f90095cd..9ec3a4c9bdbd 100644
--- a/x11-clocks/gdesklets-ebichuclock/Makefile
+++ b/x11-clocks/gdesklets-ebichuclock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ebichuclock
PORTVERSION= 0.1.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-clocks gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
@@ -19,7 +19,7 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets \
${LOCALBASE}/share/gdesklets/Sensors/Clock/__init__.py:${PORTSDIR}/x11-clocks/gdesklets-clock
USE_BZIP2= yes
-USE_XLIB= yes
+USE_XORG= x11
NAME= ebichuclock
DATADIR= ${PREFIX}/share
diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile
index 7a7a4dac7a7d..7b9be9668e5a 100644
--- a/x11-clocks/glclock/Makefile
+++ b/x11-clocks/glclock/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
USE_GL= yes
MAKEFILE= makefile
MAKE_ARGS= CC="${CXX}" LN="${CXX}" OPT="${OPT}" \
- INCLUDE_PATH="-I${X11BASE}/include" \
- LIB_PATH="-L${X11BASE}/lib"
+ INCLUDE_PATH="-I${LOCALBASE}/include" \
+ LIB_PATH="-L${LOCALBASE}/lib"
OPT= -DIMAGE_PATH="\\\"${PREFIX}/lib/X11/glclock/\\\"" \
${CFLAGS}
diff --git a/x11-clocks/mlclock/Makefile b/x11-clocks/mlclock/Makefile
index a546d77ae3de..f43aa1fc9ebb 100644
--- a/x11-clocks/mlclock/Makefile
+++ b/x11-clocks/mlclock/Makefile
@@ -21,9 +21,9 @@ PLIST_FILES= bin/mlclock %%DATADIR%%/mlclockrc %%DATADIR%%/mlclockrc-kanji
PLIST_DIRS= %%DATADIR%%
do-build:
- cd ${WRKSRC} && ${CC} ${CFLAGS} -I${X11BASE}/include \
+ cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include \
-DRCFILE=\".mlclockrc\" mlclock.c -o mlclock \
- -L${X11BASE}/lib -lX11
+ -L${LOCALBASE}/lib -lX11
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mlclock ${PREFIX}/bin
diff --git a/x11-clocks/osdclock/Makefile b/x11-clocks/osdclock/Makefile
index f7f405517889..d1fc0b3e0eb9 100644
--- a/x11-clocks/osdclock/Makefile
+++ b/x11-clocks/osdclock/Makefile
@@ -20,8 +20,8 @@ COMMENT= Small clock which uses libxosd to render text to the root window
LIB_DEPENDS= xosd.4:${PORTSDIR}/misc/xosd
USE_GCC= 3.4
-MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \
- LDFLAGS="${LDFLAGS} -L${X11BASE}/lib ${PTHREAD_LIBS}" \
+MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
PREFIX="${PREFIX}"
PLIST_FILES= bin/osd_clock
diff --git a/x11-clocks/pclock/Makefile b/x11-clocks/pclock/Makefile
index f21e3a37f054..2d29e29ed90a 100644
--- a/x11-clocks/pclock/Makefile
+++ b/x11-clocks/pclock/Makefile
@@ -19,8 +19,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig/src
USE_XORG= x11 xau xdmcp xext xpm
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" OBJS="Main.o Graphics.o" \
- INCDIR="-I. -I${X11BASE}/include ${CPPFLAGS}" \
- LIBDIR="-L${X11BASE}/lib ${LDFLAGS}"
+ INCDIR="-I. -I${LOCALBASE}/include ${CPPFLAGS}" \
+ LIBDIR="-L${LOCALBASE}/lib ${LDFLAGS}"
post-extract:
cd ${WRKSRC} && ${RM} -f getopt*
diff --git a/x11-clocks/washerdryer/files/patch-Makefile b/x11-clocks/washerdryer/files/patch-Makefile
index 0acc494f0165..dfee17e0e23b 100644
--- a/x11-clocks/washerdryer/files/patch-Makefile
+++ b/x11-clocks/washerdryer/files/patch-Makefile
@@ -4,7 +4,7 @@
-LIBDIR = -L/usr/X11R6/lib -L/usr/lib -L/opt/gnome/lib
-LIBS = -lXpm -lXext -lX11 -lm -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl
-CFLAGS = -I/usr/X11R6/include -I/usr/lib/glib/include -I/opt/gnome/include/gtk-1.2 -I/opt/gnome/include/glib-1.2 -I/opt/gnome/lib/glib/include
-+LIBDIR = -L${X11BASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
+LIBS = `${GTK_CONFIG} --libs` -lXpm
+CFLAGS += `${GTK_CONFIG} --cflags`
OBJS = washerDryer.o \
diff --git a/x11-clocks/wmbday/Makefile b/x11-clocks/wmbday/Makefile
index a3fec729962a..e67cf4f2a2bc 100644
--- a/x11-clocks/wmbday/Makefile
+++ b/x11-clocks/wmbday/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://buzzinhornetz.ath.cx/wmbday/files/
MAINTAINER= uspoerlein@gmail.com
COMMENT= Window Maker dock app that will remind you of birthdays
-BUILD_DEPENDS= ${X11BASE}/bin/xmessage:${X_CLIENTS_PORT}
+BUILD_DEPENDS= xmessage:${PORTSDIR}/x11/xmessage
HAS_CONFIGURE= yes
MAKEFILE= BSDmakefile
diff --git a/x11-clocks/wmbinclock/Makefile b/x11-clocks/wmbinclock/Makefile
index 5421031746a3..4d1a38d57e2f 100644
--- a/x11-clocks/wmbinclock/Makefile
+++ b/x11-clocks/wmbinclock/Makefile
@@ -21,7 +21,7 @@ USE_XORG= xpm
post-patch:
@${REINPLACE_CMD} -e 's|#include <values.h>||' ${WRKSRC}/wmBinClock.c
@${REINPLACE_CMD} -e 's|^CC.*=|CC ?=|' -e 's|^CFLAGS.*=|CFLAGS +=|' \
- -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/Makefile
+ -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wmBinClock ${PREFIX}/bin
diff --git a/x11-clocks/wmblueclock/files/patch-Makefile b/x11-clocks/wmblueclock/files/patch-Makefile
index a15735ee0605..001c63aa699c 100644
--- a/x11-clocks/wmblueclock/files/patch-Makefile
+++ b/x11-clocks/wmblueclock/files/patch-Makefile
@@ -10,8 +10,8 @@
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+CC ?= cc
-+LDIR = -L${X11BASE}/lib
-+IDIR = -I${X11BASE}/include
++LDIR = -L${LOCALBASE}/lib
++IDIR = -I${LOCALBASE}/include
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/x11-clocks/wmcalclock/files/patch-aa b/x11-clocks/wmcalclock/files/patch-aa
index a028f58e2fd1..da2526f3ff77 100644
--- a/x11-clocks/wmcalclock/files/patch-aa
+++ b/x11-clocks/wmcalclock/files/patch-aa
@@ -8,9 +8,9 @@
-LIBDIR = -L/usr/X11R6/lib
+CC ?= gcc
+CFLAGS ?= -O2
-+INCDIR = -I${X11BASE}/include
++INCDIR = -I${LOCALBASE}/include
+DESTDIR= ${PREFIX}
-+LIBDIR = -L${X11BASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
# for Linux
LIBS = -lXpm -lX11 -lXext
diff --git a/x11-clocks/wmclock/Makefile b/x11-clocks/wmclock/Makefile
index 33ffbfe279e3..67287e5f3373 100644
--- a/x11-clocks/wmclock/Makefile
+++ b/x11-clocks/wmclock/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A dockable clock applet for Window Maker
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN1= wmclock.1
PLIST_FILES= bin/wmclock
diff --git a/x11-clocks/wmdate/Makefile b/x11-clocks/wmdate/Makefile
index 28d37cbbbc3a..a4265ac74944 100644
--- a/x11-clocks/wmdate/Makefile
+++ b/x11-clocks/wmdate/Makefile
@@ -17,7 +17,7 @@ COMMENT= Date app for the WindowMaker dock
LIB_DEPENDS= dockapp.2:${PORTSDIR}/x11-wm/libdockapp
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
PLIST_FILES= bin/wmdate
diff --git a/x11-clocks/wmitime/files/patch-aa b/x11-clocks/wmitime/files/patch-aa
index 7a8b2d6f4813..ed9398b1b546 100644
--- a/x11-clocks/wmitime/files/patch-aa
+++ b/x11-clocks/wmitime/files/patch-aa
@@ -5,9 +5,9 @@
-LIBDIR = -L/usr/X11R6/lib
+CC ?= gcc
+CFLAGS ?= -O2
-+INCDIR = -I${X11BASE}/include
++INCDIR = -I${LOCALBASE}/include
+DESTDIR = ${PREFIX}
-+LIBDIR = -L${X11BASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
LIBS = -lXpm -lXext -lX11 -lm
-FLAGS = -O2
OBJS = wmitime.o \
diff --git a/x11-clocks/wmtime/Makefile b/x11-clocks/wmtime/Makefile
index dbe703c7d648..f1c648b052ee 100644
--- a/x11-clocks/wmtime/Makefile
+++ b/x11-clocks/wmtime/Makefile
@@ -19,7 +19,7 @@ COMMENT= Time/Date applet for WindowMaker
PLIST_FILES= bin/wmtime
WRKSRC= ${WRKDIR}/wmtime.app/wmtime
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
post-extract:
${CP} ${WRKSRC}/../Imakefile ${WRKSRC}/Imakefile
diff --git a/x11-clocks/wmtimer/files/patch-wmtimer::Makefile b/x11-clocks/wmtimer/files/patch-wmtimer::Makefile
index af58c5b4d9ec..1da0510384d8 100644
--- a/x11-clocks/wmtimer/files/patch-wmtimer::Makefile
+++ b/x11-clocks/wmtimer/files/patch-wmtimer::Makefile
@@ -5,7 +5,7 @@
-LIBDIR = -L/usr/X11R6/lib -L/usr/lib
-LIBS = -lXpm -lXext -lX11 -lpthread `pkg-config --libs gtk+-2.0`
-CFLAGS = `pkg-config --cflags gtk+-2.0`
-+LIBDIR = -L${X11BASE}/lib -L${LOCALBASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
+LIBS = -lXpm -lXext -lX11 `pkg-config --libs gtk+-2.0` ${PTHREAD_LIBS}
+CFLAGS += `pkg-config --cflags gtk+-2.0` ${PTHREAD_CFLAGS}
diff --git a/x11-clocks/wmtz/Makefile b/x11-clocks/wmtz/Makefile
index 527cb798e42b..bb14c6d375fc 100644
--- a/x11-clocks/wmtz/Makefile
+++ b/x11-clocks/wmtz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmtz
PORTVERSION= 0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-clocks windowmaker afterstep
MASTER_SITES= http://www.geocities.com/jl1n/wmtz/
@@ -15,17 +15,16 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Dockapp that displays the time in different time zones
USE_GMAKE= yes
-MAKE_ARGS= CC="${CC}" FLAGS="${CFLAGS} -I${X11BASE}/include" \
- LIBDIR="-L${X11BASE}/lib"
+MAKE_ARGS= CC="${CC}" FLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+ LIBDIR="-L${LOCALBASE}/lib"
WRKSRC= ${WRKDIR}/${DISTNAME}/wmtz
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm x11
MAN1= wmtz.1
PLIST_FILES= bin/wmtz \
etc/wmtzrc.default
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/wmtz ${X11BASE}/bin/wmtz
+ @${INSTALL_PROGRAM} ${WRKSRC}/wmtz ${PREFIX}/bin/wmtz
@${INSTALL_MAN} ${WRKSRC}/wmtz.1 ${PREFIX}/man/man1/
@${ECHO} "===> Installing wmtzrc.default in ${PREFIX}/etc."
@${ECHO} "===> Copy it to ~/.wmtzrc or ${PREFIX}/etc/wmtzrc and modify it."
diff --git a/x11-clocks/xmms-alarm/Makefile b/x11-clocks/xmms-alarm/Makefile
index 8741ae9bc1fc..9e9056933b27 100644
--- a/x11-clocks/xmms-alarm/Makefile
+++ b/x11-clocks/xmms-alarm/Makefile
@@ -27,7 +27,7 @@ PLIST_FILES= lib/xmms/General/libalarm.so
post-patch:
@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure
-# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/xmms/General
+# This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/xmms/General
do-install:
${INSTALL_DATA} ${WRKSRC}/src/.libs/libalarm.so ${PREFIX}/lib/xmms/General
diff --git a/x11-clocks/xtu/Makefile b/x11-clocks/xtu/Makefile
index 6289d68619af..04957d0f439a 100644
--- a/x11-clocks/xtu/Makefile
+++ b/x11-clocks/xtu/Makefile
@@ -27,7 +27,7 @@ USE_GNOME= imlib
CPPFLAGS= -DUSE_IMLIB `${IMLIB_CONFIG} --cflags`
LDFLAGS= `${IMLIB_CONFIG} --libs`
.else
-USE_XPM= yes
+USE_XORG= x11 xpm xext
CPPFLAGS= -DUSE_XPM
LDFLAGS= -lXpm -lX11 -lXext
.endif