diff options
Diffstat (limited to 'misc')
81 files changed, 137 insertions, 162 deletions
diff --git a/misc/alevt/Makefile b/misc/alevt/Makefile index 9216db6eb181..9024a70ed830 100644 --- a/misc/alevt/Makefile +++ b/misc/alevt/Makefile @@ -7,7 +7,7 @@ PORTNAME= alevt PORTVERSION= 1.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MASTER_SITES= http://www.goron.de/~froese/alevt/ @@ -17,7 +17,7 @@ COMMENT= X11 teletext decoding and display program OPTIONS= PNG "Export pages as PNG image" on \ SMALLFONT "Use a smaller and thiner font" off -USE_X_PREFIX= yes +USE_XORG= x11 MAN1= alevt.1x alevt-date.1 alevt-cap.1 .include <bsd.port.pre.mk> diff --git a/misc/alevt/files/patch-aa b/misc/alevt/files/patch-aa index 2c32a2df2a13..90d529d266c1 100644 --- a/misc/alevt/files/patch-aa +++ b/misc/alevt/files/patch-aa @@ -19,8 +19,8 @@ +.endif -CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I/usr/X11R6/include -I/usr/local/include -W -+CFLAGS+=-DVERSION=\"$(VER)\" $(DEFS) -I${X11BASE}/include -I${LOCALBASE}/include -W -+X11_LIBS=-L${X11BASE}/lib -lX11 ++CFLAGS+=-DVERSION=\"$(VER)\" $(DEFS) -I${LOCALBASE}/include -W ++X11_LIBS=-L${LOCALBASE}/lib -lX11 EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS) diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile index 33bc49a983d6..7f29fb497eac 100644 --- a/misc/amanda-server/Makefile +++ b/misc/amanda-server/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-dump-honor-nodump --with-buffered-dump \ --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WANT_PERL= yes OPTIONS= GNUTAR "use GNU tar" on diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile index 33bc49a983d6..7f29fb497eac 100644 --- a/misc/amanda25-server/Makefile +++ b/misc/amanda25-server/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-dump-honor-nodump --with-buffered-dump \ --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WANT_PERL= yes OPTIONS= GNUTAR "use GNU tar" on diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile index 33bc49a983d6..7f29fb497eac 100644 --- a/misc/amanda26-server/Makefile +++ b/misc/amanda26-server/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-dump-honor-nodump --with-buffered-dump \ --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WANT_PERL= yes OPTIONS= GNUTAR "use GNU tar" on diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile index 33bc49a983d6..7f29fb497eac 100644 --- a/misc/amanda32-server/Makefile +++ b/misc/amanda32-server/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-dump-honor-nodump --with-buffered-dump \ --disable-libtool --prefix=${PREFIX} \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WANT_PERL= yes OPTIONS= GNUTAR "use GNU tar" on diff --git a/misc/asbutton/Makefile b/misc/asbutton/Makefile index 5b9271dd0f34..d13e2e5584a1 100644 --- a/misc/asbutton/Makefile +++ b/misc/asbutton/Makefile @@ -7,18 +7,17 @@ PORTNAME= asbutton PORTVERSION= 0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc windowmaker afterstep MASTER_SITES= http://www.tigr.net/afterstep/download/asbutton/ MAINTAINER= ports@FreeBSD.org COMMENT= A dockapp that displays 4 or 9 buttons to run apps of your choice -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 xpm ALL_TARGET= asbutton -MAKE_ARGS= INCLUDES="-I${X11BASE}/include/X11 -I${X11BASE}/include" \ - LIBINC="-L${X11BASE}/lib" LIBS="-lm -lX11 -lXpm -lXext" \ +MAKE_ARGS= INCLUDES="-I${LOCALBASE}/include/X11 -I${LOCALBASE}/include" \ + LIBINC="-L${LOCALBASE}/lib" LIBS="-lm -lX11 -lXpm -lXext" \ CCFLAGS="${CFLAGS}" .include <bsd.port.pre.mk> diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile index 738ec2566160..ceb79f8ae03d 100644 --- a/misc/astrolog/Makefile +++ b/misc/astrolog/Makefile @@ -10,7 +10,7 @@ PORTNAME= astrolog PORTVERSION= 5.40 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= misc MASTER_SITES= http://www.astrolog.org/ftp/ephem/:ephem \ http://www.astrolog.org/ftp/:dist @@ -23,7 +23,7 @@ COMMENT= An astrology program for X11 and alpha-numeric terminals USE_ZIP= yes .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 MAKE_ARGS= -DX11 .endif EXTRACT_CMD= ${SH} diff --git a/misc/astrolog/files/patch-aa b/misc/astrolog/files/patch-aa index 292bf68515ce..0598b081ba64 100644 --- a/misc/astrolog/files/patch-aa +++ b/misc/astrolog/files/patch-aa @@ -7,8 +7,8 @@ -LIBS = -lm -lX11 -CFLAGS = -O +.if defined(X11) -+LIBS = -L${X11BASE}/lib -lX11 -lm -+CFLAGS += -DX11 -I${X11BASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\" ++LIBS = -L${LOCALBASE}/lib -lX11 -lm ++CFLAGS += -DX11 -I${LOCALBASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\" +.else +LIBS = -lm +CFLAGS += -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\" diff --git a/misc/bdelta/Makefile b/misc/bdelta/Makefile index 275bac96cd1b..2d62d0533f5a 100644 --- a/misc/bdelta/Makefile +++ b/misc/bdelta/Makefile @@ -15,7 +15,7 @@ MAINTAINER= novel@FreeBSD.org COMMENT= An advanced delta creator, patcher, and library USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= bin/bdelta \ bin/bpatch \ lib/libbdelta.so diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile index a3e1151dba06..b0ce00a07aeb 100644 --- a/misc/compat4x/Makefile +++ b/misc/compat4x/Makefile @@ -67,7 +67,7 @@ PLIST_SUB+= AMD64_ONLY="" AMD64NA="@comment " PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32" USE_LDCONFIG32= ${TARGET32_DIR} .undef USE_LDCONFIG -INSTALLS_SHLIB= no +USE_LDCONFIG= no .else PLIST_SUB+= AMD64_ONLY="@comment " AMD64NA="" .endif diff --git a/misc/earthview/Makefile b/misc/earthview/Makefile index ee86d801b330..a85e0824609e 100644 --- a/misc/earthview/Makefile +++ b/misc/earthview/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Produces a view output of an arbitrary region of the Earth USE_XORG= xpm -CFLAGS+= -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include ALL_TARGET= earthview PLIST_FILES= bin/earthview share/earthview/topography/topography.cps \ @@ -29,7 +29,7 @@ PLIST_DIRS= share/earthview/topography share/earthview/population \ post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%CC%%|${CC}|g" \ - -e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%%X11BASE%%|${X11BASE}|g" \ + -e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/Makefile pre-build: diff --git a/misc/earthview/files/patch-Makefile b/misc/earthview/files/patch-Makefile index 8f1780581e3e..cfecbaacbf8f 100644 --- a/misc/earthview/files/patch-Makefile +++ b/misc/earthview/files/patch-Makefile @@ -11,7 +11,7 @@ earthview: earthview.c - gcc -Wall -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -L/usr/X11R6/lib -lX11 -lm -lz -lbz2 -+ %%CC%% %%CFLAGS%% -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -L%%X11BASE%%/lib -lX11 -lm -lz -lbz2 ++ %%CC%% %%CFLAGS%% -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -L%%LOCALBASE%%/lib -lX11 -lm -lz -lbz2 install: install -c -s earthview $(BINDIR) diff --git a/misc/estic/files/patch-estic-freebsd-x.mak b/misc/estic/files/patch-estic-freebsd-x.mak index 4ae90761cf59..4582aa733c08 100644 --- a/misc/estic/files/patch-estic-freebsd-x.mak +++ b/misc/estic/files/patch-estic-freebsd-x.mak @@ -12,7 +12,7 @@ INCDIR = ../spunk -CFLAGS = -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES -+CFLAGS += -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L $(X11BASE)/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES ++CFLAGS += -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L $(LOCALBASE)/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES # ------------------------------------------------------------------------------ @@ -34,7 +34,7 @@ xestic: $(LIB) $(OBJS) - $(CC) -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11 -+ $(CC) -L $(X11BASE)/lib -o xestic $(OBJS) $(LIB) -ltermcap -lX11 ++ $(CC) -L $(LOCALBASE)/lib -o xestic $(OBJS) $(LIB) -ltermcap -lX11 # ------------------------------------------------------------------------------ diff --git a/misc/estic/files/patch-spunk-freebsd-x.mak b/misc/estic/files/patch-spunk-freebsd-x.mak index 7cf9d00c6e2c..2ee626383f41 100644 --- a/misc/estic/files/patch-spunk-freebsd-x.mak +++ b/misc/estic/files/patch-spunk-freebsd-x.mak @@ -9,7 +9,7 @@ # Flags for the gnu compiler -CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -x c++ -I /usr/X11R6/include -fno-implicit-templates -DEXPLICIT_TEMPLATES -+CFLAGS += -DFREEBSD -g -Wall -x c++ -I $(X11BASE)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES ++CFLAGS += -DFREEBSD -g -Wall -x c++ -I $(LOCALBASE)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES LIB = spunk.a ZIPFILE = spunk.zip @@ -20,7 +20,7 @@ -xresed: $(LIB) $(RESEDITOBJS) - $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -lg++ -L/usr/X11R6/lib -lX11 +resed: $(LIB) $(RESEDITOBJS) -+ $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -L$(X11BASE)/lib -lX11 ++ $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -L$(LOCALBASE)/lib -lX11 lib: $(LIB) diff --git a/misc/explosions/Makefile b/misc/explosions/Makefile index 80801f2351da..54590abb9d88 100644 --- a/misc/explosions/Makefile +++ b/misc/explosions/Makefile @@ -7,7 +7,7 @@ PORTNAME= explosions PORTVERSION= 0.2005.07.31 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= misc MASTER_SITES= ftp://ftp.billsgames.com/unix/x/explosions/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/^0.//} @@ -18,7 +18,6 @@ COMMENT= 3D objects flying around resembling explosions with various effects USE_SDL= sdl image USE_GMAKE= yes USE_PERL5_BUILD=yes -USE_X_PREFIX= yes post-patch: @${PERL} -pi -e 's!CFLAGS=-Wall -O2!CFLAGS+=-Wall!; \ diff --git a/misc/fcalc/Makefile b/misc/fcalc/Makefile index 3fc8dda3976a..1204695b224c 100644 --- a/misc/fcalc/Makefile +++ b/misc/fcalc/Makefile @@ -7,7 +7,7 @@ PORTNAME= fcalc PORTVERSION= 1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/ DISTNAME= ${PORTNAME}-tcl @@ -18,7 +18,7 @@ COMMENT= F/Calc is a calculator for photographic formulas RUN_DEPENDS= ${LOCALBASE}/lib/tix8.1/Tix.tcl:${PORTSDIR}/x11-toolkits/tix NO_BUILD= yes -USE_X_PREFIX= yes +USE_XORG= x11 xt USE_TK_RUN= 84 WRKSRC= ${WRKDIR}/${PORTNAME}-1.00 diff --git a/misc/firestring/Makefile b/misc/firestring/Makefile index c76c778deb34..3fa47f71bf4e 100644 --- a/misc/firestring/Makefile +++ b/misc/firestring/Makefile @@ -17,7 +17,7 @@ COMMENT= A library to make string handling easier in C USE_BZIP2= yes HAS_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/misc/floatator/Makefile b/misc/floatator/Makefile index 0f3dcd77c2b2..368a2e720baf 100644 --- a/misc/floatator/Makefile +++ b/misc/floatator/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_MOTIF= yes MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DNDEBUG" \ - X11INCLUDE="-I${X11BASE}/include" X11LIB="-L${X11BASE}/lib" + X11INCLUDE="-I${LOCALBASE}/include" X11LIB="-L${LOCALBASE}/lib" PLIST_FILES= bin/floatator bin/floatator_X_interface do-install: diff --git a/misc/flyway/Makefile b/misc/flyway/Makefile index f84d8fa9814b..9448dd2c546b 100644 --- a/misc/flyway/Makefile +++ b/misc/flyway/Makefile @@ -8,7 +8,7 @@ PORTNAME= flyway PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc python geography MASTER_SITES= http://www.bellz.org/flyway/ @@ -18,7 +18,6 @@ COMMENT= A VFR/IFR Route Planner for Pilots BUILD_DEPENDS= pyuic:${PORTSDIR}/x11-toolkits/py-qt RUN_DEPENDS= pyuic:${PORTSDIR}/x11-toolkits/py-qt -USE_X_PREFIX= yes USE_PYTHON= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/FlyWay diff --git a/misc/gkrellm-gamma/Makefile b/misc/gkrellm-gamma/Makefile index 7b09912f9dea..06e76a14df53 100644 --- a/misc/gkrellm-gamma/Makefile +++ b/misc/gkrellm-gamma/Makefile @@ -7,16 +7,17 @@ PORTNAME= gkrellm-gamma PORTVERSION= 2.03 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= misc MASTER_SITES= http://www.sweb.cz/tripie/gkrellm/gamma/dist/ MAINTAINER= pav@FreeBSD.org COMMENT= XFree86 gamma correction plugin for GKrellM -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 +USE_XORG= x11 xxf86vm PLIST_FILES= libexec/gkrellm2/plugins/gamma.so MAKE_ENV= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins ALL_TARGET= gamma.so diff --git a/misc/gkrellm-gamma/files/patch-Makefile b/misc/gkrellm-gamma/files/patch-Makefile index 846399fee623..c907dd6ea3ad 100644 --- a/misc/gkrellm-gamma/files/patch-Makefile +++ b/misc/gkrellm-gamma/files/patch-Makefile @@ -5,7 +5,7 @@ CFLAGS ?= -O -g CFLAGS += $(FLAGS) -LIBS = -L/usr/X11R6/lib $(GTK_LIB) -+LIBS = -L${X11BASE}/lib $(GTK_LIB) -lXxf86vm ++LIBS = -L${LOCALBASE}/lib $(GTK_LIB) -lXxf86vm LFLAGS = -shared CC ?= gcc INSTALL = install -c diff --git a/misc/gkrellm-helium/Makefile b/misc/gkrellm-helium/Makefile index 97646415b265..2c2d42020a20 100644 --- a/misc/gkrellm-helium/Makefile +++ b/misc/gkrellm-helium/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= pav@FreeBSD.org COMMENT= GKrellM plugin reading data from helium thermometer at Strahov, Prague -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 diff --git a/misc/gkrellm-xkb/Makefile b/misc/gkrellm-xkb/Makefile index 1974f17cdfc6..4ca5a145acc6 100644 --- a/misc/gkrellm-xkb/Makefile +++ b/misc/gkrellm-xkb/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.sweb.cz/tripie/gkrellm/xkb/dist/ MAINTAINER= pav@FreeBSD.org COMMENT= X keyboard layout plugin for GKrellM -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 PLIST_FILES= libexec/gkrellm2/plugins/xkb.so diff --git a/misc/gkrellmbgchg/Makefile b/misc/gkrellmbgchg/Makefile index 20b74b0b3a3a..efc27bfcef85 100644 --- a/misc/gkrellmbgchg/Makefile +++ b/misc/gkrellmbgchg/Makefile @@ -14,10 +14,9 @@ MASTER_SITES= http://www.bender-suhl.de/stefan/comp/sources/ MAINTAINER= ports@FreeBSD.org COMMENT= A plugin for GKrellM, which changes the desktop's background image -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm -USE_X_PREFIX= yes USE_GNOME= imlib PLIST_FILES= libexec/gkrellm/plugins/gkrellmbgchg.so diff --git a/misc/gkrellmbgchg2/Makefile b/misc/gkrellmbgchg2/Makefile index 504cfc1a4f1d..05275ed274f8 100644 --- a/misc/gkrellmbgchg2/Makefile +++ b/misc/gkrellmbgchg2/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.bender-suhl.de/stefan/comp/sources/ MAINTAINER= ports@FreeBSD.org COMMENT= A plugin for GKrellM, which changes the desktop's background image -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 USE_GNOME= gtk20 diff --git a/misc/gkrellmfmonitor/Makefile b/misc/gkrellmfmonitor/Makefile index 19feab7f2a47..3d6e192ae343 100644 --- a/misc/gkrellmfmonitor/Makefile +++ b/misc/gkrellmfmonitor/Makefile @@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= GKrellM FMonitor plugin -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm PLIST_FILES= libexec/gkrellm/plugins/fmonitor.so diff --git a/misc/gkrellmfmonitor2/Makefile b/misc/gkrellmfmonitor2/Makefile index 1ff41a0c177f..9d6f63d4e1e7 100644 --- a/misc/gkrellmfmonitor2/Makefile +++ b/misc/gkrellmfmonitor2/Makefile @@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= GKrellM FMonitor plugin -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 LATEST_LINK= gkrellmfmonitor2 diff --git a/misc/gkrellmlaunch/Makefile b/misc/gkrellmlaunch/Makefile index 03059b98f2f3..e5482e072699 100644 --- a/misc/gkrellmlaunch/Makefile +++ b/misc/gkrellmlaunch/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= An application launcher plugin for GKrellM -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm PLIST_FILES= libexec/gkrellm/plugins/gkrellmlaunch.so diff --git a/misc/gkrellmlaunch2/Makefile b/misc/gkrellmlaunch2/Makefile index 162352ad018d..63e46fd1c357 100644 --- a/misc/gkrellmlaunch2/Makefile +++ b/misc/gkrellmlaunch2/Makefile @@ -9,14 +9,13 @@ PORTNAME= gkrellmlaunch PORTVERSION= 0.5 PORTREVISION= 3 CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF PKGNAMESUFFIX= 2 MAINTAINER= hideo@lastamericanempire.com COMMENT= An application launcher 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 PLIST_FILES= libexec/gkrellm2/plugins/gkrellmlaunch.so diff --git a/misc/gkrellshoot/Makefile b/misc/gkrellshoot/Makefile index cbc980d79e06..7dc82b9cc499 100644 --- a/misc/gkrellshoot/Makefile +++ b/misc/gkrellshoot/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= elitetek@tekrealm.net COMMENT= A screen locking and screen capture plugin for GKrellM -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm \ import:${PORTSDIR}/graphics/ImageMagick diff --git a/misc/gkrellweather2/Makefile b/misc/gkrellweather2/Makefile index fb1ac703b6b4..84f5f38730c8 100644 --- a/misc/gkrellweather2/Makefile +++ b/misc/gkrellweather2/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= pav@FreeBSD.org COMMENT= GKrellWeather is a weather plugin for GKrellM -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 USE_GMAKE= yes diff --git a/misc/gkx86info/Makefile b/misc/gkx86info/Makefile index 58c2150ce6d1..e92941c53ec5 100644 --- a/misc/gkx86info/Makefile +++ b/misc/gkx86info/Makefile @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GKrellM plugin that simply prints the current clock speed -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm ONLY_FOR_ARCHS= i386 diff --git a/misc/gkx86info2/Makefile b/misc/gkx86info2/Makefile index b026063e8f42..3e52e8df7f10 100644 --- a/misc/gkx86info2/Makefile +++ b/misc/gkx86info2/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://anchois.free.fr/ \ MAINTAINER= ports@fsck.ch COMMENT= GKrellM2 plugin that simply prints the current clock speed -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 ONLY_FOR_ARCHS= i386 diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile index 210662072530..2d8ec337cade 100644 --- a/misc/gnome-osd/Makefile +++ b/misc/gnome-osd/Makefile @@ -7,14 +7,13 @@ PORTNAME= gnome-osd DISTVERSION= 0.11.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MASTER_SITES= http://telecom.inescporto.pt/~gjc/gnome-osd/${DISTVERSION:C|-.*$||}/ MAINTAINER= ports@FreeBSD.org COMMENT= An On-Screen-Display infrastructure using Pango text rendering -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix intlhack pygnome2 USE_PYTHON= yes USE_GMAKE= yes diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile index cafe1e61a773..ba7b72c70591 100644 --- a/misc/gnome-user-docs/Makefile +++ b/misc/gnome-user-docs/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-user-docs PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -20,7 +21,6 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes diff --git a/misc/goblin/Makefile b/misc/goblin/Makefile index 3857c72f81ad..d7301ac1ff6c 100644 --- a/misc/goblin/Makefile +++ b/misc/goblin/Makefile @@ -8,7 +8,7 @@ PORTNAME= goblin PORTVERSION= 2.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://www.math.uni-augsburg.de/~fremuth/goblin.docs/ \ ${MASTER_SITE_LOCAL} @@ -23,6 +23,7 @@ LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 CONFLICTS= ImageMagick-[0-9]* display-* +USE_XORG= x11 USE_GMAKE= yes USE_GCC= 3.2 MAKE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" \ @@ -32,9 +33,9 @@ MAKE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" \ ALL_TARGET= all goblin.a glpk.a PLIST_SUB+= VERSION=${PORTVERSION:R} -CFLAGS+= -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 \ - -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CFLAGS+= -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/ \ + ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} WISH= ${LOCALBASE}/bin/wish8.3 diff --git a/misc/gplbp/Makefile b/misc/gplbp/Makefile index b4f306f25505..c6c7578ae0ca 100644 --- a/misc/gplbp/Makefile +++ b/misc/gplbp/Makefile @@ -7,7 +7,7 @@ PORTNAME= gplbp PORTVERSION= 0.92 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MASTER_SITES= ftp://ftp.stampede.org/skibum/gplbp/ \ http://freebsd.unixfreunde.de/sources/ @@ -15,7 +15,6 @@ MASTER_SITES= ftp://ftp.stampede.org/skibum/gplbp/ \ MAINTAINER= ports@FreeBSD.org COMMENT= GNOME Pilot Logbook application -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes diff --git a/misc/gregexp/Makefile b/misc/gregexp/Makefile index 33cef335c225..606f5988f1c5 100644 --- a/misc/gregexp/Makefile +++ b/misc/gregexp/Makefile @@ -8,7 +8,7 @@ PORTNAME= gregexp PORTVERSION= 0.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc MASTER_SITES= http://dentrassi.de/download/gregexp/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -18,7 +18,6 @@ COMMENT= A graphical regular expression explorer LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre -USE_X_PREFIX= yes USE_GNOME= gnomeprefix libgnomeui GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile index cb5ad318cc1b..3b898f3676b9 100644 --- a/misc/gtkfind/Makefile +++ b/misc/gtkfind/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkfind PORTVERSION= 1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_BACKUP} @@ -17,7 +17,6 @@ COMMENT= The program to use to have to remember all the options to find(1) BUILD_DEPENDS= appres:${PORTSDIR}/x11/appres \ xterm:${PORTSDIR}/x11/xterm -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes diff --git a/misc/gtktalog/Makefile b/misc/gtktalog/Makefile index 09b4d28aef56..8d6842b79b14 100644 --- a/misc/gtktalog/Makefile +++ b/misc/gtktalog/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtktalog PORTVERSION= 1.0.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,7 +19,6 @@ BUILD_DEPENDS= plaympeg:${PORTSDIR}/multimedia/smpeg RUN_DEPENDS= plaympeg:${PORTSDIR}/multimedia/smpeg USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomelibs gnomeprefix gnometarget GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile index 74a90d4c3bfc..95473c3965d1 100644 --- a/misc/hotkeys/Makefile +++ b/misc/hotkeys/Makefile @@ -6,7 +6,7 @@ PORTNAME= hotkeys PORTVERSION= 0.5.7.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= misc MASTER_SITES= http://ypwong.org/hotkeys/${PORTVERSION}/ \ ${MASTER_SITE_XCONTRIB} @@ -20,10 +20,9 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CONFIGURE_ARGS= --with-db3-inc=${BDB_INCLUDE_DIR} \ --with-db3-lib=${BDB_LIB_DIR} \ - --with-db-name=${BDB_LIB_NAME} \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib + --with-db-name=${BDB_LIB_NAME} +USE_XORG= x11 xkbfile xmu GNU_CONFIGURE= yes USE_BDB= yes USE_GMAKE= yes diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile index 3f23b4d8eb0c..b3032c576a6a 100644 --- a/misc/kdeedu3/Makefile +++ b/misc/kdeedu3/Makefile @@ -23,7 +23,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_XPM= yes +USE_XORG= xpm USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile index 3f23b4d8eb0c..b3032c576a6a 100644 --- a/misc/kdeedu4/Makefile +++ b/misc/kdeedu4/Makefile @@ -23,7 +23,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_XPM= yes +USE_XORG= xpm USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile index 9fd873fff1b6..ca5509ae9533 100644 --- a/misc/krecipes-kde4/Makefile +++ b/misc/krecipes-kde4/Makefile @@ -9,8 +9,7 @@ PORTNAME= krecipes PORTVERSION= 0.9.1 PORTREVISION= 1 CATEGORIES= misc kde -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= hank@millerfarm.com COMMENT= Recipe database for cooks @@ -31,13 +30,13 @@ USE_SQLITE= yes .endif .if defined(WITH_MYSQL) -RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin +RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin .else CONFIGURE_ARGS+= --without-mysql .endif .if defined(WITH_POSTGRESQL) -RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin +RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin .else CONFIGURE_ARGS+= --without-postgresql .endif diff --git a/misc/krecipes/Makefile b/misc/krecipes/Makefile index 9fd873fff1b6..ca5509ae9533 100644 --- a/misc/krecipes/Makefile +++ b/misc/krecipes/Makefile @@ -9,8 +9,7 @@ PORTNAME= krecipes PORTVERSION= 0.9.1 PORTREVISION= 1 CATEGORIES= misc kde -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= hank@millerfarm.com COMMENT= Recipe database for cooks @@ -31,13 +30,13 @@ USE_SQLITE= yes .endif .if defined(WITH_MYSQL) -RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin +RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin .else CONFIGURE_ARGS+= --without-mysql .endif .if defined(WITH_POSTGRESQL) -RUN_DEPENDS+= ${X11BASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin +RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin .else CONFIGURE_ARGS+= --without-postgresql .endif diff --git a/misc/ldconfig_compat/Makefile b/misc/ldconfig_compat/Makefile index fac7b43dd5b2..740054c1284f 100644 --- a/misc/ldconfig_compat/Makefile +++ b/misc/ldconfig_compat/Makefile @@ -26,7 +26,7 @@ SUB_LIST= LDCONFIG_DIR=${LDCONFIG_DIR} \ LDCONFIG32_DIR=${LDCONFIG32_DIR} .if !defined(WITHOUT_X11) -LOCAL_PREFIXES= ${PREFIX} ${X11BASE} +LOCAL_PREFIXES= ${PREFIX} ${LOCALBASE} .else LOCAL_PREFIXES= ${PREFIX} .endif diff --git a/misc/ldconfig_compat/files/ldconfig_compat.sh.in b/misc/ldconfig_compat/files/ldconfig_compat.sh.in index a4899035bc34..1c3fe81701c3 100644 --- a/misc/ldconfig_compat/files/ldconfig_compat.sh.in +++ b/misc/ldconfig_compat/files/ldconfig_compat.sh.in @@ -15,8 +15,8 @@ start_cmd="ldconfig_start" stop_cmd=":" load_rc_config $name -: ${ldconfig_local_dirs="%%PREFIX%%/%%LDCONFIG_DIR%% %%X11BASE%%/%%LDCONFIG_DIR%%"} -: ${ldconfig_local32_dirs="%%PREFIX%%/%%LDCONFIG32_DIR%% %%X11BASE%%/%%LDCONFIG32_DIR%%"} +: ${ldconfig_local_dirs="%%PREFIX%%/%%LDCONFIG_DIR%% %%LOCALBASE%%/%%LDCONFIG_DIR%%"} +: ${ldconfig_local32_dirs="%%PREFIX%%/%%LDCONFIG32_DIR%% %%LOCALBASE%%/%%LDCONFIG32_DIR%%"} ldconfig_start() { diff --git a/misc/libpri-bristuff/Makefile b/misc/libpri-bristuff/Makefile index ad650f904e16..5a8976669ed2 100644 --- a/misc/libpri-bristuff/Makefile +++ b/misc/libpri-bristuff/Makefile @@ -22,7 +22,7 @@ MAINTAINER= fjoe@FreeBSD.org COMMENT= A C implementation of the Primary Rate ISDN specification USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/misc/mc/Makefile b/misc/mc/Makefile index e841a6d625e6..56ae36f7b1aa 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -64,7 +64,7 @@ _MANLANG= es hu it pl ru.KOI8-R sr .if !defined(WITH_X11) || defined(MINIMAL) CONFIGURE_ARGS+=--without-x .else -USE_XLIB= yes +USE_XORG= x11 xext .endif .if !defined(WITH_EDIT) && (defined(WITHOUT_EDIT) || defined(MINIMAL)) diff --git a/misc/menushki/Makefile b/misc/menushki/Makefile index befd4e5ea583..ed4369e98696 100644 --- a/misc/menushki/Makefile +++ b/misc/menushki/Makefile @@ -7,18 +7,16 @@ PORTNAME= menushki PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Menu converter between varieties of Window Managers -USE_X_PREFIX= yes +USE_XORG= x11 GNU_CONFIGURE= yes USE_GMAKE= yes -USE_XLIB= yes USE_GCC= 2.95 PLIST_FILES= bin/menushki diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile index 6505db4a27e5..9ccd8d0fbd7a 100644 --- a/misc/misterproper/Makefile +++ b/misc/misterproper/Makefile @@ -7,16 +7,14 @@ PORTNAME= misterproper PORTVERSION= 0.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF #ftp://misterproper.sourceforge.net/pub/misterproper/releases/ \ -MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A GNOME application designed to manage cyclic tasks -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomelibs gnomeprefix gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/misc/opencyc/Makefile b/misc/opencyc/Makefile index 694ceb482109..8eca0f129d65 100644 --- a/misc/opencyc/Makefile +++ b/misc/opencyc/Makefile @@ -9,15 +9,14 @@ PORTNAME= opencyc PORTVERSION= 0.7.0 PORTREVISION= 3 CATEGORIES= misc linux -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= General knowledge base and commonsense reasoning engine USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_BUILD= yes PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/misc/pspresent/Makefile b/misc/pspresent/Makefile index 09941cd67a93..6b43b2b14079 100644 --- a/misc/pspresent/Makefile +++ b/misc/pspresent/Makefile @@ -21,7 +21,7 @@ PLIST_FILES= bin/pspresent MAN1= pspresent.1 post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|$${X11BASE}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr/X11R6|$${LOCALBASE}|' ${WRKSRC}/Makefile do-install: @${INSTALL_PROGRAM} ${WRKSRC}/pspresent ${PREFIX}/bin diff --git a/misc/py-osd/Makefile b/misc/py-osd/Makefile index 74204ef6572f..1b836d55abd2 100644 --- a/misc/py-osd/Makefile +++ b/misc/py-osd/Makefile @@ -28,7 +28,7 @@ PORTDOCS= AUTHORS ChangeLog ChangeLog.old README README.daemon pyosd.html DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/setup.py post-install: .if !defined(NOPORTDOCS) diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile index 346bd3206c91..b17476b44f2f 100644 --- a/misc/quick-lounge-applet/Makefile +++ b/misc/quick-lounge-applet/Makefile @@ -8,7 +8,7 @@ PORTNAME= quick-lounge-applet PORTVERSION= 2.12.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 @@ -18,7 +18,6 @@ MAINTAINER= marcus@FreeBSD.org COMMENT= Applet to orginize your preferred applications on the GNOME Panel USE_BZIP2= yes -USE_XLIB= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_GMAKE= yes diff --git a/misc/snowflake/Makefile b/misc/snowflake/Makefile index d2c4c4ee2ff6..3c90a84cfac3 100644 --- a/misc/snowflake/Makefile +++ b/misc/snowflake/Makefile @@ -7,7 +7,7 @@ PORTNAME= snowflake PORTVERSION= 0.01a -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -18,7 +18,6 @@ COMMENT= A snowflake image generator WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig PLIST_FILES= bin/snowflake -USE_X_PREFIX= yes USE_GNOME= gtk12 MAKE_ARGS= CC="${CC} ${CFLAGS}" diff --git a/misc/sonytv/Makefile b/misc/sonytv/Makefile index 0a6a98e20794..45639d82a4b5 100644 --- a/misc/sonytv/Makefile +++ b/misc/sonytv/Makefile @@ -7,7 +7,7 @@ PORTNAME= sonytv PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc tk MASTER_SITES= http://tools.ana.com/demos/ @@ -16,8 +16,6 @@ COMMENT= Sony-compatible TV remote RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83 -USE_X_PREFIX= yes - NO_BUILD= yes IS_INTERACTIVE= yes diff --git a/misc/terraform/Makefile b/misc/terraform/Makefile index a7023a8280ec..d1f318df8042 100644 --- a/misc/terraform/Makefile +++ b/misc/terraform/Makefile @@ -8,17 +8,16 @@ PORTNAME= terraform PORTVERSION= 0.9.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= misc gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Interactive height field generation and manipulation program BUILD_DEPENDS= ${LOCALBASE}/lib/libtrio.a:${PORTSDIR}/devel/trio -USE_X_PREFIX= yes +USE_XORG= x11 USE_BISON= build USE_GNOME= gnomeprefix gnomehack gnomeprint USE_GMAKE= yes diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile index 85b5a318b589..6407d9a3d4b3 100644 --- a/misc/tkman/Makefile +++ b/misc/tkman/Makefile @@ -23,8 +23,8 @@ USE_GMAKE= yes MAKE_ARGS= WISH="${PREFIX}/bin/wish8.4" \ texinfodir="${PREFIX}/${INFO_PATH}" \ gzgrep="\"/usr/bin/zgrep -E\"" \ - mastermen="\"/usr/share/man ${PREFIX}/man ${X11BASE}/man\"" \ - masterbin="\"/usr/bin ${PREFIX}/bin ${X11BASE}/bin\"" \ + mastermen="\"/usr/share/man ${PREFIX}/man ${LOCALBASE}/man\"" \ + masterbin="\"/usr/bin ${PREFIX}/bin ${LOCALBASE}/bin\"" \ manformat="{groff -Tlatin1 -te -mandoc}" \ manprint="{groff -mandoc -Tps -te -l}" diff --git a/misc/translator/Makefile b/misc/translator/Makefile index e76e9499f800..21c374775f33 100644 --- a/misc/translator/Makefile +++ b/misc/translator/Makefile @@ -7,7 +7,7 @@ PORTNAME= translator PORTVERSION= 0.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MASTER_SITES= http://jodrell.net/files/attic/translator/ @@ -19,7 +19,6 @@ RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 ${SITE_PERL}/${PERL_ARCH}/Gnome2/GConf.pm:${PORTSDIR}/devel/p5-Gnome2-GConf \ ${SITE_PERL}/WWW/Babelfish.pm:${PORTSDIR}/www/p5-WWW-Babelfish -USE_X_PREFIX= yes USE_PERL5= 5.8.0+ NO_BUILD= yes diff --git a/misc/videotext/files/patch-ba b/misc/videotext/files/patch-ba index 4f95ae68f243..85b5d5ac43d2 100644 --- a/misc/videotext/files/patch-ba +++ b/misc/videotext/files/patch-ba @@ -35,8 +35,8 @@ -INCLUDEDIRS = -I/usr/openwin/include -I/usr/X11R6/include -LIBDIRS = -L/usr/openwin/lib -L/usr/X11R6/lib -+INCLUDEDIRS = -I${X11BASE}/include -+LIBDIRS = -L${X11BASE}/lib ++INCLUDEDIRS = -I${LOCALBASE}/include ++LIBDIRS = -L${LOCALBASE}/lib -CC = gcc -CCFLAGS = -O2 -fomit-frame-pointer -pipe -Wall #-Wstrict-prototypes diff --git a/misc/wmScoreBoard/Makefile b/misc/wmScoreBoard/Makefile index dbdc4366db38..b97f4a0439bd 100644 --- a/misc/wmScoreBoard/Makefile +++ b/misc/wmScoreBoard/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmScoreBoard PORTVERSION= 0.30 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc windowmaker MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pat @@ -19,8 +19,7 @@ RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src USE_GMAKE= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm post-install: .ifndef(NOPORTDOCS) diff --git a/misc/wmScoreBoard/files/patch-wmScoreBoard::Makefile b/misc/wmScoreBoard/files/patch-wmScoreBoard::Makefile index e4978168a07c..1ea667d4d07b 100644 --- a/misc/wmScoreBoard/files/patch-wmScoreBoard::Makefile +++ b/misc/wmScoreBoard/files/patch-wmScoreBoard::Makefile @@ -9,8 +9,8 @@ -LIBDIR = -L/usr/X11R6/lib -DESTDIR = /usr/X11R6 +CFLAGS += -g -Wall -+INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib +DESTDIR = $(PREFIX) # for linux diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile index 7421e537d58d..c30d2c73038d 100644 --- a/misc/wmcalendar/Makefile +++ b/misc/wmcalendar/Makefile @@ -32,7 +32,7 @@ PLIST_FILES= bin/wmCalendar post-patch: ${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \ - -e 's#/usr/X11R6#${X11BASE}#g' \ + -e 's#/usr/X11R6#${LOCALBASE}#g' \ ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmCalendar ${PREFIX}/bin diff --git a/misc/wmfirew/Makefile b/misc/wmfirew/Makefile index edf7de064551..8b363159b17b 100644 --- a/misc/wmfirew/Makefile +++ b/misc/wmfirew/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmfirew PORTVERSION= 0.20 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc windowmaker afterstep MASTER_SITES= http://web.novalis.org/programs/ @@ -17,8 +17,7 @@ COMMENT= A dockapp that shows fireworks in action PLIST_FILES= bin/wmfirew WRKSRC= ${WRKDIR}/${PORTNAME}.app/${PORTNAME} USE_GMAKE= yes -USE_XPM= yes -USE_X_PREFIX= yes +USE_XORG= xpm do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/misc/wmfirew/files/patch-Makefile b/misc/wmfirew/files/patch-Makefile index ccb43e80f3d9..0f086a3f31de 100644 --- a/misc/wmfirew/files/patch-Makefile +++ b/misc/wmfirew/files/patch-Makefile @@ -9,8 +9,8 @@ $FreeBSD$ -OBJS = wmfirew.o ../wmgeneral/wmgeneral.o +CC ?= gcc +CFLAGS += -c -Wall -+INCDIR = -I${X11BASE}/include -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib +LIBS = -lXpm -lXext -lX11 +OBJS = wmfirew.o ../wmgeneral/wmgeneral.o diff --git a/misc/wminfo/Makefile b/misc/wminfo/Makefile index 86cf25c0a8b1..42b7addbebc5 100644 --- a/misc/wminfo/Makefile +++ b/misc/wminfo/Makefile @@ -21,7 +21,7 @@ USE_XORG= xpm post-patch: @${REINPLACE_CMD} -e 's|$$(LIBS)$$|& $$(OBJS)|g' \ - -e 's|/usr/X11R6|$$(X11BASE)|g' \ + -e 's|/usr/X11R6|$$(LOCALBASE)|g' \ -e 's|/share/include|/include|g' \ ${WRKSRC}/Makefile diff --git a/misc/wmjulia/Makefile b/misc/wmjulia/Makefile index da7583075ae4..a4bc8c367d34 100644 --- a/misc/wmjulia/Makefile +++ b/misc/wmjulia/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmjulia PORTVERSION= 0.40 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc windowmaker afterstep MASTER_SITES= http://web.novalis.org/programs/ @@ -17,7 +17,7 @@ COMMENT= A dockapp that creates an animated Julia set PLIST_FILES= bin/wmjulia WRKSRC= ${WRKDIR}/${PORTNAME}.app/${PORTNAME} USE_GMAKE= yes -USE_XPM= xpm xext +USE_XORG= xpm xext do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/misc/wmjulia/files/patch-Makefile b/misc/wmjulia/files/patch-Makefile index 40d5d17eb9f0..cc43c4b93930 100644 --- a/misc/wmjulia/files/patch-Makefile +++ b/misc/wmjulia/files/patch-Makefile @@ -9,8 +9,8 @@ $FreeBSD$ -OBJS = wmjulia.o ../wmgeneral/wmgeneral.o +CC ?= gcc +CFLAGS += -c -Wall -+INCDIR = -I${X11BASE}/include -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib +LIBS = -lXpm -lXext -lX11 -lm +OBJS = wmjulia.o ../wmgeneral/wmgeneral.o diff --git a/misc/wmpal/Makefile b/misc/wmpal/Makefile index e37d51278ef1..0ba00e217e1f 100644 --- a/misc/wmpal/Makefile +++ b/misc/wmpal/Makefile @@ -16,8 +16,8 @@ COMMENT= A one of the most useless dockapps in the world USE_XORG= xpm USE_GNOME= gnometarget GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" PORTDOCS= README PLIST_FILES= bin/wmpal diff --git a/misc/wmtunlo/Makefile b/misc/wmtunlo/Makefile index b48f3d00772e..831d3cf9f398 100644 --- a/misc/wmtunlo/Makefile +++ b/misc/wmtunlo/Makefile @@ -7,14 +7,14 @@ PORTNAME= wmtunlo PORTVERSION= 0.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc windowmaker MASTER_SITES= http://clay.ll.pl/download/ MAINTAINER= ports@FreeBSD.org COMMENT= A falling-down-a-tunnel dockapp -USE_X_PREFIX= yes +USE_XORG= x11 xpm xextproto ALL_TARGET= wmtunlo do-install: diff --git a/misc/wmtunlo/files/patch-Makefile b/misc/wmtunlo/files/patch-Makefile index d24a245cb863..2323f5529720 100644 --- a/misc/wmtunlo/files/patch-Makefile +++ b/misc/wmtunlo/files/patch-Makefile @@ -6,8 +6,8 @@ -INCS = -I/usr/X11R6/include/X11 -LIBS = -L/usr/X11R6/lib -lXpm -lX11 -lXext -lm +CFLAGS += -Wall -+INCS = -I${X11BASE}/include -I${X11BASE}/include/X11 -+LIBS = -L${X11BASE}/lib -lXpm -lX11 -lXext -lm ++INCS = -I${LOCALBASE}/include -I${LOCALBASE}/include/X11 ++LIBS = -L${LOCALBASE}/lib -lXpm -lX11 -lXext -lm INSTALL_PREFIX = /usr/local diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile index 9be5e172ffad..43dd83af428e 100644 --- a/misc/wmweather+/Makefile +++ b/misc/wmweather+/Makefile @@ -27,7 +27,7 @@ GNU_CONFIGURE= yes USE_ICONV= yes USE_XORG= xpm -CONFIGURE_ARGS+= --with-libwraster=${X11BASE} +CONFIGURE_ARGS+= --with-libwraster=${LOCALBASE} MAN1= wmweather+.1 diff --git a/misc/wmweather/Makefile b/misc/wmweather/Makefile index ebfbf2f62532..aba7d98fc796 100644 --- a/misc/wmweather/Makefile +++ b/misc/wmweather/Makefile @@ -14,12 +14,12 @@ MAINTAINER= kris@FreeBSD.org COMMENT= A WMaker dockapp which displays meteorological data for your city LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl -BUILD_DEPENDS= xmessage:${X_CLIENTS_PORT} -RUN_DEPENDS= xmessage:${X_CLIENTS_PORT} +BUILD_DEPENDS= xmessage:${PORTSDIR}/x11/xmessage +RUN_DEPENDS= xmessage:${PORTSDIR}/x11/xmessage -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_GMAKE= yes USE_XORG= xpm diff --git a/misc/wmwork/Makefile b/misc/wmwork/Makefile index 9801195afb36..db8a64c6e5f6 100644 --- a/misc/wmwork/Makefile +++ b/misc/wmwork/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmwork PORTVERSION= 0.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc windowmaker afterstep MASTER_SITES= http://www.godisch.de/debian/wmwork/ @@ -16,8 +16,7 @@ COMMENT= A dockapp that keeps track of time you have spent on something WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -26,8 +25,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= wmwork.1 PLIST_FILES= bin/wmwork -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmwork ${PREFIX}/bin diff --git a/misc/wmx10/Makefile b/misc/wmx10/Makefile index e0f09f0a0b80..26ce6deae680 100644 --- a/misc/wmx10/Makefile +++ b/misc/wmx10/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmx10 PORTVERSION= 0.03 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc windowmaker MASTER_SITES= http://www.cs.uml.edu/~jhawkins/wmx10/ @@ -16,7 +16,7 @@ COMMENT= Remote control for X10 devices WRKSRC= ${WRKDIR}/wmx10.app/wmx10 -USE_XPM= xpm x11 ice +USE_XORG= xpm x11 ice USE_GMAKE= yes PLIST_FILES= bin/wmx10 diff --git a/misc/wmx10/files/patch-aa b/misc/wmx10/files/patch-aa index e8d848dd4c53..0cec3accd25a 100644 --- a/misc/wmx10/files/patch-aa +++ b/misc/wmx10/files/patch-aa @@ -3,8 +3,8 @@ @@ -1,12 +1,12 @@ -INCDIR = -I/usr/X11R6/include -LIBDIR = -L/usr/X11R6/lib -+INCDIR = -I${X11BASE}/include -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 OBJS = br_cmd.o wmx10.o ../wmgeneral/wmgeneral.o -CFLAGS = -D$(shell echo `uname -s`) #-DDEBUG @@ -26,4 +26,4 @@ - strip wmx10 - mv wmx10 /usr/local/bin +install: wmx10 -+ ${BSD_INSTALL_PROGRAM} wmx10 ${X11BASE}/bin ++ ${BSD_INSTALL_PROGRAM} wmx10 ${LOCALBASE}/bin diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile index 1a35095e36bf..0bbbb62ab2c4 100644 --- a/misc/xosd/Makefile +++ b/misc/xosd/Makefile @@ -16,15 +16,15 @@ MASTER_SITE_SUBDIR= perky MAINTAINER= perky@FreeBSD.org COMMENT= X On-Screen-Display Library and XMMS plug-in -XMMS_CONFIG?= ${X11BASE}/bin/xmms-config +XMMS_CONFIG?= ${LOCALBASE}/bin/xmms-config USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes CONFIGURE_ENV= LIBS=${PTHREAD_LIBS}' -L${LOCALBASE}/lib' \ - CFLAGS='${CFLAGS}' X11BASE='${X11BASE}' \ + CFLAGS='${CFLAGS}' LOCALBASE='${LOCALBASE}' \ GTK_CONFIG='${GTK_CONFIG}' GLIB_CONFIG='${GLIB_CONFIG}' \ - XMMS_PLUGINDIR=${X11BASE}/lib/xmms + XMMS_PLUGINDIR=${LOCALBASE}/lib/xmms MAN1= osd_cat.1 xosd-config.1 MAN3= xosd.3 xosd_create.3 xosd_destroy.3 xosd_display.3 \ diff --git a/misc/xpns/Makefile b/misc/xpns/Makefile index fc78b33f8047..156708e328be 100644 --- a/misc/xpns/Makefile +++ b/misc/xpns/Makefile @@ -7,7 +7,7 @@ PORTNAME= xpns PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc cad MASTER_SITES= http://robotics.ee.uwa.edu.au/pns/ftp/ DISTFILES= pns_source.tar.Z @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Petri-Net Simulator for Xwindows NO_WRKSUBDIR= yes -USE_X_PREFIX= yes +USE_XORG= x11 xaw MAKEFILE= makefile ALL_TARGET= pns diff --git a/misc/xpns/files/patch-aa b/misc/xpns/files/patch-aa index 761738ab4a17..b59bf9c99252 100644 --- a/misc/xpns/files/patch-aa +++ b/misc/xpns/files/patch-aa @@ -11,10 +11,10 @@ -I = -I/usr/local/X11R5/include - -L = -L/usr/local/X11R5/lib -lXaw -lXmu -lXt -lXext -lX11 -lm -+I = -I$(X11BASE)/include ++I = -I$(LOCALBASE)/include -+L = -L$(X11BASE)/lib -lXaw -lXmu -lXt -lXext -lX11 -lm -+L +=-Wl,-rpath,$(X11BASE)/lib ++L = -L$(LOCALBASE)/lib -lXaw -lXmu -lXt -lXext -lX11 -lm ++L +=-Wl,-rpath,$(LOCALBASE)/lib #------------------------------------------ # COMPILER UND LINKER |