aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
commit3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch)
treed573ea09b2bf6be67cb497df199932da9e2707c4 /devel
parent40049f4af2200d0dcf33596508688623fc75f764 (diff)
downloadports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz
ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip
Notes
Diffstat (limited to 'devel')
-rw-r--r--devel/ace+tao/Makefile2
-rw-r--r--devel/acovea/Makefile2
-rw-r--r--devel/adabindx/Makefile8
-rw-r--r--devel/adasdl/Makefile7
-rw-r--r--devel/adasdl/files/patch-AdaGL-make.conf_x112
-rw-r--r--devel/adasdl/files/patch-AdaSDL-make.conf_x112
-rw-r--r--devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x112
-rw-r--r--devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile2
-rw-r--r--devel/adasdl/files/patch-AdaSDL_image-make.conf_x112
-rw-r--r--devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x112
-rw-r--r--devel/adime/Makefile2
-rw-r--r--devel/anjuta/Makefile5
-rw-r--r--devel/antlrworks/Makefile2
-rw-r--r--devel/asis/Makefile2
-rw-r--r--devel/asmutils/Makefile2
-rw-r--r--devel/bonobo-conf/Makefile3
-rw-r--r--devel/bonobo/Makefile3
-rw-r--r--devel/bug-buddy/Makefile2
-rw-r--r--devel/c2lib/Makefile2
-rw-r--r--devel/cdk/Makefile2
-rw-r--r--devel/cgilib/Makefile2
-rw-r--r--devel/clanlib/Makefile3
-rw-r--r--devel/cmake/Makefile2
-rw-r--r--devel/cppunit/Makefile2
-rw-r--r--devel/dbus-qt3/Makefile2
-rw-r--r--devel/dbus/Makefile4
-rw-r--r--devel/ddd/Makefile2
-rw-r--r--devel/devhelp/Makefile3
-rw-r--r--devel/djgpp-binutils/Makefile2
-rw-r--r--devel/dotconf++/Makefile2
-rw-r--r--devel/dotconf/Makefile2
-rw-r--r--devel/doxygen/Makefile2
-rw-r--r--devel/eric/Makefile4
-rw-r--r--devel/esdl/files/patch-c__src_Makefile2
-rw-r--r--devel/evolution-gconf-tools/Makefile3
-rw-r--r--devel/fib/Makefile2
-rw-r--r--devel/gauche-sdl/Makefile4
-rw-r--r--devel/gconf/Makefile3
-rw-r--r--devel/gconfmm/Makefile5
-rw-r--r--devel/gconfmm26/Makefile4
-rw-r--r--devel/gengameng/Makefile4
-rw-r--r--devel/gettext/Makefile2
-rw-r--r--devel/glade2/Makefile2
-rw-r--r--devel/glade3/Makefile2
-rw-r--r--devel/glademm/Makefile3
-rw-r--r--devel/gnome-build/Makefile2
-rw-r--r--devel/gnome-crash/Makefile3
-rw-r--r--devel/gnome-vfs/Makefile3
-rw-r--r--devel/gnome-vfs1/Makefile3
-rw-r--r--devel/goffice/Makefile2
-rw-r--r--devel/goffice04/Makefile3
-rw-r--r--devel/goffice1/Makefile3
-rw-r--r--devel/gtranslator/Makefile3
-rw-r--r--devel/guichan/Makefile4
-rw-r--r--devel/hs-tclhaskell-ghc/Makefile4
-rw-r--r--devel/icu/Makefile2
-rw-r--r--devel/icu4/Makefile2
-rw-r--r--devel/json-c/Makefile2
-rw-r--r--devel/judy/Makefile2
-rw-r--r--devel/kaptain/Makefile6
-rw-r--r--devel/kdevelop/Makefile2
-rw-r--r--devel/kxl/Makefile9
-rw-r--r--devel/kyra/Makefile7
-rw-r--r--devel/leaktracer/Makefile2
-rw-r--r--devel/libafterbase/Makefile6
-rw-r--r--devel/libassetml/Makefile5
-rw-r--r--devel/libast/Makefile3
-rw-r--r--devel/libbegemot/Makefile2
-rw-r--r--devel/libbonobomm/Makefile5
-rw-r--r--devel/libchipcard/Makefile2
-rw-r--r--devel/libdict/Makefile2
-rw-r--r--devel/libdnsres/Makefile2
-rw-r--r--devel/libds/Makefile2
-rw-r--r--devel/libevocosm/Makefile2
-rw-r--r--devel/libgconf-java/Makefile2
-rw-r--r--devel/libglade-java/Makefile2
-rw-r--r--devel/libglade/Makefile3
-rw-r--r--devel/libglademm/Makefile8
-rw-r--r--devel/libglademm24/Makefile7
-rw-r--r--devel/libgpc/Makefile2
-rw-r--r--devel/libgsf/Makefile5
-rw-r--r--devel/libisc/Makefile2
-rw-r--r--devel/libltdl15/Makefile2
-rw-r--r--devel/libmcve/Makefile2
-rw-r--r--devel/libmimedir/Makefile2
-rw-r--r--devel/libmonetra/Makefile2
-rw-r--r--devel/libmtrie/Makefile2
-rw-r--r--devel/libpci/Makefile2
-rw-r--r--devel/libphish/Makefile2
-rw-r--r--devel/libpperl/Makefile2
-rw-r--r--devel/libs11n/Makefile2
-rw-r--r--devel/libstatgrab/Makefile2
-rw-r--r--devel/libstroke/Makefile4
-rw-r--r--devel/libtai/Makefile2
-rw-r--r--devel/libthai/Makefile2
-rw-r--r--devel/libukcprog/Makefile2
-rw-r--r--devel/libunicode/Makefile5
-rw-r--r--devel/libvanessa_adt/Makefile2
-rw-r--r--devel/libvanessa_logger/Makefile2
-rw-r--r--devel/libvanessa_socket/Makefile2
-rw-r--r--devel/libvc/Makefile2
-rw-r--r--devel/libytnef/Makefile2
-rw-r--r--devel/linux-allegro/Makefile2
-rw-r--r--devel/linux-f10-allegro/Makefile2
-rw-r--r--devel/linux-f10-libglade/Makefile2
-rw-r--r--devel/linux-f10-libglade2/Makefile2
-rw-r--r--devel/linux-f10-libsigc++20/Makefile2
-rw-r--r--devel/linux-f8-allegro/Makefile2
-rw-r--r--devel/linux-f8-libglade/Makefile2
-rw-r--r--devel/linux-f8-libglade2/Makefile2
-rw-r--r--devel/linux-f8-libsigc++20/Makefile2
-rw-r--r--devel/linux-glib2/Makefile2
-rw-r--r--devel/linux-libglade/Makefile2
-rw-r--r--devel/linux-libglade2/Makefile2
-rw-r--r--devel/linux-libsigc++20/Makefile2
-rw-r--r--devel/linux-runrev/Makefile2
-rw-r--r--devel/log4cplus/Makefile2
-rw-r--r--devel/log4cxx/Makefile2
-rw-r--r--devel/lrmi/Makefile2
-rw-r--r--devel/mico/Makefile6
-rw-r--r--devel/mimir/Makefile2
-rw-r--r--devel/mingw32-binutils/Makefile2
-rw-r--r--devel/mpatrol/Makefile2
-rw-r--r--devel/msp430-binutils/Makefile2
-rw-r--r--devel/ncnf/Makefile2
-rw-r--r--devel/oaf/Makefile5
-rw-r--r--devel/ocaml-sdl/Makefile6
-rw-r--r--devel/ode-devel/Makefile4
-rw-r--r--devel/ode/Makefile6
-rw-r--r--devel/omniNotify/Makefile2
-rw-r--r--devel/ossp-al/Makefile2
-rw-r--r--devel/ossp-ex/Makefile2
-rw-r--r--devel/ossp-val/Makefile2
-rw-r--r--devel/ossp-var/Makefile2
-rw-r--r--devel/ossp-xds/Makefile2
-rw-r--r--devel/p5-SDL/Makefile2
-rw-r--r--devel/physfs/Makefile2
-rw-r--r--devel/pikdev/Makefile4
-rw-r--r--devel/plan9port/Makefile3
-rw-r--r--devel/poslib/Makefile2
-rw-r--r--devel/prepstools/Makefile2
-rw-r--r--devel/ptypes/Makefile2
-rw-r--r--devel/py-libgsf/Makefile4
-rw-r--r--devel/py-notify/Makefile3
-rw-r--r--devel/py-ode/Makefile4
-rw-r--r--devel/py-omniorb/Makefile2
-rw-r--r--devel/py-qt4-dbus/Makefile3
-rw-r--r--devel/qmake/Makefile2
-rw-r--r--devel/qmake4/Makefile2
-rw-r--r--devel/qsa/Makefile2
-rw-r--r--devel/qt4-qt3support/Makefile4
-rw-r--r--devel/qt4-uic3/Makefile3
-rw-r--r--devel/rhtvision/Makefile12
-rw-r--r--devel/root/Makefile11
-rw-r--r--devel/root/files/patch-asimage-Module.mk2
-rw-r--r--devel/rote/Makefile2
-rw-r--r--devel/ruby-sdl/Makefile2
-rw-r--r--devel/simgear/Makefile8
-rw-r--r--devel/st/Makefile2
-rw-r--r--devel/str/Makefile2
-rw-r--r--devel/subcommander/Makefile2
-rw-r--r--devel/subcommander2/Makefile2
-rw-r--r--devel/tclcl/Makefile7
-rw-r--r--devel/tclreadline/Makefile5
-rw-r--r--devel/tclxml/Makefile2
-rw-r--r--devel/tinyq/Makefile2
-rw-r--r--devel/tmake/Makefile2
-rw-r--r--devel/upp/Makefile16
-rw-r--r--devel/upp/files/patch-uppsrc-ide-Makefile4
-rw-r--r--devel/wininfo/Makefile10
-rw-r--r--devel/xfc/Makefile2
-rw-r--r--devel/xwpe/Makefile2
-rw-r--r--devel/xwpe/files/patch-094
173 files changed, 250 insertions, 275 deletions
diff --git a/devel/ace+tao/Makefile b/devel/ace+tao/Makefile
index 0456019e15e7..141599717205 100644
--- a/devel/ace+tao/Makefile
+++ b/devel/ace+tao/Makefile
@@ -23,7 +23,7 @@ TAO_VERSION= 1.4.2
USE_BZIP2= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
TESTS= "@comment "
.if defined(WITH_TESTS)
diff --git a/devel/acovea/Makefile b/devel/acovea/Makefile
index 2b4023d29711..abca5a7b0092 100644
--- a/devel/acovea/Makefile
+++ b/devel/acovea/Makefile
@@ -17,7 +17,7 @@ COMMENT= Tool to find the "best" compiler options using genetic algorithm
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
evocosm-3.1.1:${PORTSDIR}/devel/libevocosm
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= CPPFLAGS=-I${PREFIX}/include/ LDFLAGS=-L${PREFIX}/lib/
diff --git a/devel/adabindx/Makefile b/devel/adabindx/Makefile
index 749202472b16..d161a8f0270a 100644
--- a/devel/adabindx/Makefile
+++ b/devel/adabindx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= adabindx
PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://home.arcor.de/hfvogt/
@@ -17,18 +17,18 @@ COMMENT= An Ada-binding to the X Window System and *tif
BUILD_DEPENDS= gnatmake:${PORTSDIR}/lang/gnat
USE_MOTIF= yes
-USE_X_PREFIX= yes
+USE_XORG= x11
post-patch:
# @mv ${WRKSRC}/lib ${WRKSRC}/src
#do-install:
-# @${MKDIR} ${X11BASE}/lib/adabindx
+# @${MKDIR} ${LOCALBASE}/lib/adabindx
# @(for i in `cat pkg-plist|grep "lib/adabindx"|grep -v dirrm|sed "s/lib\/adabindx\///"`; do \
# ${INSTALL_DATA} ${WRKSRC}/lib/$${i} ${PREFIX}/lib/adabindx; \
# done)
#
-# @${MKDIR} ${X11BASE}/share/adabindx
+# @${MKDIR} ${LOCALBASE}/share/adabindx
# @(for i in `cat pkg-plist|grep "share/adabindx"|grep -v dirrm|sed "s/share\/adabindx\///"`; do \
# ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/share/adabindx; \
# done)
diff --git a/devel/adasdl/Makefile b/devel/adasdl/Makefile
index fbec5f608fe1..9216098d8b5a 100644
--- a/devel/adasdl/Makefile
+++ b/devel/adasdl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= adasdl
PORTVERSION= 20010504
PORTREVISION= 5
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= AdaSDL_${PORTVERSION}
MAINTAINER= david@realityrift.com
@@ -29,9 +28,9 @@ do-patch:
for i in `${FIND} ${WRKSRC} -name 'make.conf_x11'`; do \
${REINPLACE_CMD} \
-e 's,/usr/local,${LOCALBASE},g' \
- -e 's,/usr/X11R6,${X11BASE},g' \
+ -e 's,/usr/X11R6,${LOCALBASE},g' \
-e 's,-lpthread,-pthread,' \
- -e 's,-lGL,-L${X11BASE}/lib\ -lX11 -lXext -lGL,' \
+ -e 's,-lGL,-L${LOCALBASE}/lib\ -lX11 -lXext -lGL,' \
$${i}; \
done
diff --git a/devel/adasdl/files/patch-AdaGL-make.conf_x11 b/devel/adasdl/files/patch-AdaGL-make.conf_x11
index 17f914a0ff0b..08bb026f4bf8 100644
--- a/devel/adasdl/files/patch-AdaGL-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaGL-make.conf_x11
@@ -3,7 +3,7 @@
@@ -1,5 +1,5 @@
#LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lpthread -L/usr/lib -lGL -lGLU
-LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lXext -lX11 -lGL -lGLU
++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib -lXext -lX11 -lGL -lGLU
GNATHTML=/usr/local/bin/gnathtml.pl
PERL=/usr/bin/perl
diff --git a/devel/adasdl/files/patch-AdaSDL-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL-make.conf_x11
index 740144d50f13..b979af7c9734 100644
--- a/devel/adasdl/files/patch-AdaSDL-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaSDL-make.conf_x11
@@ -3,7 +3,7 @@
@@ -1,5 +1,5 @@
#LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU
-LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL -lpthread -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL -pthread -lGL -lGLU
++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib -lSDL -pthread -lGL -lGLU
GNATHTML=/usr/local/bin/gnathtml.pl
PERL=/usr/bin/perl
EXE=
diff --git a/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11
index f8fb309baef8..e09365908891 100644
--- a/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11
@@ -3,6 +3,6 @@
@@ -1,4 +1,4 @@
#LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU
-LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL_mixer -lSDL -lpthread -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU
++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU
EXE=
diff --git a/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile b/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile
index b0b4612b24ce..8168bf335259 100644
--- a/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile
+++ b/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile
@@ -4,7 +4,7 @@
-INC+=-I../../AdaSDL/binding -I../../AdaGL/GL -I..
-include ../make.conf
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU
++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU
+
+INC+=-I${LOCALBASE}/lib/adaSDL -I${LOCALBASE}/lib/adaGL -I..
diff --git a/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11
index ba7104bfd4f0..cc48156d842c 100644
--- a/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11
@@ -3,6 +3,6 @@
@@ -1,4 +1,4 @@
#LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU
-LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL_image -lSDL -lpthread -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_image -lSDL -pthread -lGL -lGLU
++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib -lSDL_image -lSDL -pthread -lGL -lGLU
EXE=
diff --git a/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11
index c344fbf0ac34..71868d9c5484 100644
--- a/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11
@@ -3,6 +3,6 @@
@@ -1,4 +1,4 @@
#LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU
-LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lSDL_mixer -lSDL -lpthread -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU
++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib -lSDL_mixer -lSDL -pthread -lGL -lGLU
EXE=
diff --git a/devel/adime/Makefile b/devel/adime/Makefile
index 4b55f4f7eb6d..0d077a786cbf 100644
--- a/devel/adime/Makefile
+++ b/devel/adime/Makefile
@@ -25,7 +25,7 @@ INFO= adime
MAKEFILE= makefile
INSTALL_TARGET= install install-info install-man
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
pre-build:
@(cd ${WRKSRC} && ${SH} fix.sh unix)
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index f18a39da35eb..6681454c3ec3 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -8,9 +8,9 @@
PORTNAME= anjuta
PORTVERSION= 2.4.1
+PORTREVISION= 1
CATEGORIES= devel gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= anjuta
+MASTER_SITES= SF
MAINTAINER= gnome@FreeBSD.org
COMMENT= Integrated Development Environment for C and C++
@@ -30,7 +30,6 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
USE_BZIP2= yes
-USE_XLIB= yes
USE_AUTOTOOLS= autotools:run
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/devel/antlrworks/Makefile b/devel/antlrworks/Makefile
index 3fbe2bcf3553..5e4c1ec28833 100644
--- a/devel/antlrworks/Makefile
+++ b/devel/antlrworks/Makefile
@@ -6,6 +6,7 @@
PORTNAME= antlrworks
PORTVERSION= 1.1.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel java
MASTER_SITES= http://www.antlr.org/download/
@@ -16,7 +17,6 @@ COMMENT= The ANTLR GUI Development Environment
USE_ZIP= yes
EXTRACT_AFTER_ARGS= "-d${DISTNAME}"
-USE_X_PREFIX= yes
ONLY_FOR_ARCHS= i386 amd64
diff --git a/devel/asis/Makefile b/devel/asis/Makefile
index a9945b43e317..09f968350b0e 100644
--- a/devel/asis/Makefile
+++ b/devel/asis/Makefile
@@ -19,7 +19,7 @@ COMMENT= GNAT implementation of the Ada Semantic Interface Specification
BUILD_DEPENDS= adagcc:${PORTSDIR}/lang/gnat
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/devel/asmutils/Makefile b/devel/asmutils/Makefile
index 6a1579fc92d5..9bef0fb56af9 100644
--- a/devel/asmutils/Makefile
+++ b/devel/asmutils/Makefile
@@ -19,7 +19,7 @@ ONLY_FOR_ARCHS= i386
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
LDCONFIG_DIRS= ${PREFIX}/lib/asmutils
# This will play merry hell with portlint
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 4010b09452dd..1430edfd89f3 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bonobo-conf
PORTVERSION= 0.16
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/bonobo-conf/0.16
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= sources/bonobo-conf/0.16
MAINTAINER= gnome@FreeBSD.org
COMMENT= Bonobo configuration moniker
-USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack bonobo gconf
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 729484e67c87..0680f6871655 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bonobo
PORTVERSION= 1.0.22
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
@@ -18,7 +18,6 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= The component and compound document system for GNOME
USE_BZIP2= yes
-USE_XLIB= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix oaf gnomehier gnomeprint
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index efe22fb7f2be..38e96010ea2f 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -8,6 +8,7 @@
PORTNAME= bug-buddy
PORTVERSION= 2.22.0
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,7 +21,6 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_XLIB= yes
INSTALLS_ICONS= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/c2lib/Makefile b/devel/c2lib/Makefile
index 3879e4ce2a3a..e7acc1818edc 100644
--- a/devel/c2lib/Makefile
+++ b/devel/c2lib/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= cdoc:${PORTSDIR}/devel/cdoc \
make+:${PORTSDIR}/devel/makeplus
LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index c841037c6222..d4b8d42e12e8 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -40,7 +40,7 @@ LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
CONFIGURE_ARGS+=--with-ncurses
ALL_TARGET= default examples demos cli cdkshlib
INSTALL_TARGET= install installCDKSHLibrary
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include "${.CURDIR}/maninfo.mk"
diff --git a/devel/cgilib/Makefile b/devel/cgilib/Makefile
index b42190ec5a5b..4b22e6fac75d 100644
--- a/devel/cgilib/Makefile
+++ b/devel/cgilib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.infodrom.org/projects/cgilib/download/ \
MAINTAINER= demon@FreeBSD.org
COMMENT= A library of procedures for developing CGI programs in C
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAKEFILE= ${FILESDIR}/Makefile.bsd
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index 4c7853d8d568..cc7abc08b33f 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -8,6 +8,7 @@
PORTNAME= clanlib
PORTVERSION= 0.8.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= http://www.clanlib.org/download/releases-0.8/ \
@@ -32,7 +33,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-clanJavaScript --disable-docs
USE_GMAKE= yes
-USE_XLIB= yes
+USE_XORG= x11
USE_GNOME= gnomehack gnometarget pkgconfig
USE_LDCONFIG= yes
USE_SDL= gfx
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 346c7b804a27..20201b816510 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -25,6 +25,6 @@ MAN1= ccmake.1 cmake.1 ctest.1
post-patch:
@${GREP} -rl '/usr/X11R6' ${WRKSRC}/Modules ${WRKSRC}/Tests | \
- ${XARGS} ${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g'
+ ${XARGS} ${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g'
.include <bsd.port.mk>
diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile
index b5bffa3d01b9..f944ecee0edf 100644
--- a/devel/cppunit/Makefile
+++ b/devel/cppunit/Makefile
@@ -15,7 +15,7 @@ COMMENT= C++ port of the JUnit framework for unit testing
USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.if defined(WITH_DOXYGEN)
BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
diff --git a/devel/dbus-qt3/Makefile b/devel/dbus-qt3/Makefile
index 20e89618a2a7..b7d492c76bc0 100644
--- a/devel/dbus-qt3/Makefile
+++ b/devel/dbus-qt3/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= QTDIR=${X11BASE} CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
PLIST_SUB= VERSION="1.0"
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 1cda3592a78c..d7322b60e75a 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dbus
PORTVERSION?= 1.1.20
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
@@ -41,7 +41,7 @@ MAN1= dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \
dbus-monitor.1 dbus-send.1 dbus-uuidgen.1
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= x11
.else
CONFIGURE_ARGS+=--without-x
.endif
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index f78c0c0c833b..c41b1495db5e 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -46,7 +46,7 @@ LIBXMDIR!= ${ECHO_CMD} ${MOTIFLIB} | ${SED} -e 's/\/libXm\.a//g' | ${AWK} '{prin
LIBXMDIR!= ${ECHO_CMD} ${MOTIFLIB} | ${SED} -e 's/-L//g' | ${AWK} '{print $$1}'
.endif
.else
-LIBXMDIR= ${X11BASE}
+LIBXMDIR= ${LOCALBASE}
.endif
pre-patch:
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index e493b7622233..38aa91973b40 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= devhelp
PORTVERSION= 0.19
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C,^([[:digit:]]+\.[[:digit:]]+).*,\1,}
@@ -31,7 +32,7 @@ MOZILLA= seamonkey
.endif
USE_BZIP2= yes
-USE_XLIB= yes
+USE_XORG= x11
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui libwnck
diff --git a/devel/djgpp-binutils/Makefile b/devel/djgpp-binutils/Makefile
index 56fab454977c..a52960e38fa6 100644
--- a/devel/djgpp-binutils/Makefile
+++ b/devel/djgpp-binutils/Makefile
@@ -63,7 +63,7 @@ post-install:
add-plist-post:
@${ECHO_CMD} "@unexec rmdir -p %D/${TARGET}/info 2> /dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir -p %D/${TARGET} 2> /dev/null || true" >> ${TMPPLIST}
-.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
+.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
.else
@${DO_NADA}
diff --git a/devel/dotconf++/Makefile b/devel/dotconf++/Makefile
index 712f59b26a52..a22a40a2a189 100644
--- a/devel/dotconf++/Makefile
+++ b/devel/dotconf++/Makefile
@@ -18,7 +18,7 @@ COMMENT= Configuration file parser written in C++
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
post-patch:
@${REINPLACE_CMD} -e 's|<stdint.h>|<inttypes.h>|' \
diff --git a/devel/dotconf/Makefile b/devel/dotconf/Makefile
index 72bddcd91d07..3276723ec6e4 100644
--- a/devel/dotconf/Makefile
+++ b/devel/dotconf/Makefile
@@ -18,7 +18,7 @@ USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
pre-patch:
@${REINPLACE_CMD} -e 's|-Wall -g||' ${WRKSRC}/configure
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 761e964ea73d..96f727e049c4 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -44,7 +44,7 @@ MAKE_ARGS+= HAVE_LATEX=yes
.if !defined(WITHOUT_DOXYWIZARD)
USE_QT_VER= 3
-QT_INC= ${X11BASE}/include
+QT_INC= ${LOCALBASE}/include
QTNAME= qt-mt
QT_OPENGL=
THREADLIBS= ${PTHREAD_LIBS}
diff --git a/devel/eric/Makefile b/devel/eric/Makefile
index 31341306d23f..aae87840b4aa 100644
--- a/devel/eric/Makefile
+++ b/devel/eric/Makefile
@@ -9,13 +9,13 @@ PORTNAME= eric
PORTVERSION= 3.9.4
PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= SF
MASTER_SITE_SUBDIR= eric-ide
MAINTAINER= leafy7382@gmail.com
COMMENT= A Python IDE implemented using PyQt and QScintilla
-BUILD_DEPENDS= ${X11BASE}/lib/libqscintilla.so:${PORTSDIR}/x11-toolkits/qscintilla \
+BUILD_DEPENDS= ${LOCALBASE}/lib/libqscintilla.so:${PORTSDIR}/x11-toolkits/qscintilla \
${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip \
pyuic:${PORTSDIR}/x11-toolkits/py-qt
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/esdl/files/patch-c__src_Makefile b/devel/esdl/files/patch-c__src_Makefile
index 23f706f984fd..12266a6ba4ec 100644
--- a/devel/esdl/files/patch-c__src_Makefile
+++ b/devel/esdl/files/patch-c__src_Makefile
@@ -8,7 +8,7 @@ $FreeBSD$
else
- OGLDIR = /usr
-+ OGLDIR = ${X11BASE}
++ OGLDIR = ${LOCALBASE}
# Uncomment these if your opengl header is located in another directory than
# the usual $(OGLDIR)/include/GL/gl.h
diff --git a/devel/evolution-gconf-tools/Makefile b/devel/evolution-gconf-tools/Makefile
index 035bcdec312d..bb97b5c46d98 100644
--- a/devel/evolution-gconf-tools/Makefile
+++ b/devel/evolution-gconf-tools/Makefile
@@ -8,7 +8,7 @@
PORTNAME= evolution-gconf-tools
PORTVERSION= 0.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://people.redhat.com/dmalcolm/evolution-gconf-tools/
@@ -18,7 +18,6 @@ COMMENT= Scripts to make it easier to work with Evolution's configuration
RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_PYTHON= yes
USE_GNOME= gnomeprefix
diff --git a/devel/fib/Makefile b/devel/fib/Makefile
index ad3ddb36138f..5743176b247a 100644
--- a/devel/fib/Makefile
+++ b/devel/fib/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= perky@FreeBSD.org
COMMENT= Fibonacci Heap Library
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAN3= fh_extractmin.3 fh_makeheap.3 fh_makekeyheap.3
diff --git a/devel/gauche-sdl/Makefile b/devel/gauche-sdl/Makefile
index 4b47e2d2135d..7ae3c98e72fc 100644
--- a/devel/gauche-sdl/Makefile
+++ b/devel/gauche-sdl/Makefile
@@ -17,9 +17,9 @@ MAINTAINER= erik@smluc.org
COMMENT= Scheme script interpreter with multibyte character handling
BUILD_DEPENDS= gosh:${PORTSDIR}/lang/gauche \
- ${X11BASE}/lib/X11/rgb.txt:${X_CLIENTS_PORT}
+ ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb
RUN_DEPENDS= gosh:${PORTSDIR}/lang/gauche \
- ${X11BASE}/lib/X11/rgb.txt:${X_CLIENTS_PORT}
+ ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb
PLIST_SUB= GAUCHE_VERSION="`gauche-config -V`"\
TARGET="${CONFIGURE_TARGET}"
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 2aa2e68d496a..cc96a38086c3 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gconf
PORTVERSION= 1.0.9
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/GConf/1.0
@@ -23,7 +23,6 @@ LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
USE_GMAKE= yes
-USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack gnometarget glib12 gtk12 oaf libxml orbit
USE_GETTEXT= yes
USE_LDCONFIG= yes
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 024621aa0e15..fcdec5cefa5a 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gconfmm
PORTVERSION= 2.0.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -20,11 +20,10 @@ LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_AUTOTOOLS= libtool:15
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gconf2
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
.include <bsd.port.mk>
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index e2bf7256abf4..e1bec088b14c 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gconfmm
PORTVERSION= 2.22.0
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,9 +24,8 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
LATEST_LINK= gconfmm26
USE_BZIP2= yes
-USE_XLIB= yes
+USE_XORG= x11
USE_GMAKE= yes
-USE_GCC= 3.4+
USE_GNOME= gnomehack gconf2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile
index 2827f2de7371..7a05aff63fd2 100644
--- a/devel/gengameng/Makefile
+++ b/devel/gengameng/Makefile
@@ -19,8 +19,8 @@ USE_SDL= image sdl
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS+= --program-prefix=""
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" \
- LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
+CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
post-patch:
${REINPLACE_CMD} -e "s|sdl-config|${SDL_CONFIG}|g; \
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 3da44d8b511e..57d1c2c79f1c 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -83,7 +83,7 @@ post-install:
@${INSTALL_DATA} ${WRKSRC}/gettext-tools/misc/${f} \
${PREFIX}/share/emacs/site-lisp
.endfor
- @${MKDIR} ${X11BASE}/share/locale
+ @${MKDIR} ${LOCALBASE}/share/locale
@cd ${WRKSRC}/gettext-tools/doc && make install-info-am
.include <bsd.port.mk>
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index b48703992d1b..a8b2e6e7bb4e 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= glade
PORTVERSION= 2.12.2
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -21,7 +22,6 @@ LIB_DEPENDS= rarian.0:${PORTSDIR}/textproc/rarian
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gtk20 desktopfileutils
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 8d09f128d8a4..1005ef283185 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -8,6 +8,7 @@
PORTNAME= glade3
PORTVERSION= 3.4.3
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +17,6 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A user interface builder for GTK+/GNOME
INSTALLS_ICONS= yes
-USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 libxml2 gnomeprefix gnomehack \
diff --git a/devel/glademm/Makefile b/devel/glademm/Makefile
index c3df826d124a..1cfb43fa76f4 100644
--- a/devel/glademm/Makefile
+++ b/devel/glademm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glademm
PORTVERSION= 2.6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= http://home.wtal.de/petig/Gtk/
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
@@ -15,7 +15,6 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
MAINTAINER= bland@FreeBSD.org
COMMENT= A C++ code generator backend for glade and glade2
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnometarget
GNU_CONFIGURE= yes
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index c651c4365351..f7e06f625fe8 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-build
PORTVERSION= 0.2.4
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
@@ -20,7 +21,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-
LIB_DEPENDS= gdl-gnome-1.0:${PORTSDIR}/x11-toolkits/gdl
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext
-USE_XLIB= yes
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui gnomevfs2
diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile
index df0b32cf3d0d..cab8406a497d 100644
--- a/devel/gnome-crash/Makefile
+++ b/devel/gnome-crash/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-crash
PORTVERSION= 0.0.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-crash/0.0
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= sources/gnome-crash/0.0
MAINTAINER= gnome@FreeBSD.org
COMMENT= A small coredump analysis tool for GNOME
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libglade gnomeprint
GNU_CONFIGURE= yes
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 6d8c66993264..da338f56c553 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-vfs
PORTVERSION= 2.22.0
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -26,7 +26,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
ltverhack referencehack
USE_AUTOTOOLS= libtool:15
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 80b35314d7a9..39fc0143c756 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-vfs
PORTVERSION= 1.0.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/1.0
@@ -20,7 +20,6 @@ COMMENT= GNOME Virtual File System
USE_ICONV= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix glib12 libxml gtk12 orbit gconf \
gnomemimedata gnomelibs
USE_GETTEXT= yes
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 91dd1777f454..5ffef39c1b4a 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -9,6 +9,7 @@
PORTNAME= goffice
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,7 +21,6 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_BZIP2= yes
USE_GMAKE= yes
-USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome libgnomeui ltverhack
USE_GETTEXT= yes
diff --git a/devel/goffice04/Makefile b/devel/goffice04/Makefile
index c5902b012027..0f5e07c87fe4 100644
--- a/devel/goffice04/Makefile
+++ b/devel/goffice04/Makefile
@@ -9,7 +9,7 @@
PORTNAME= goffice
PORTVERSION= 0.4.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,7 +23,6 @@ NO_LATEST_LINK= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome libgnomeui ltverhack
USE_GETTEXT= yes
diff --git a/devel/goffice1/Makefile b/devel/goffice1/Makefile
index ac8a897e9250..040e291eeb24 100644
--- a/devel/goffice1/Makefile
+++ b/devel/goffice1/Makefile
@@ -8,7 +8,7 @@
PORTNAME= goffice
PORTVERSION= 0.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2
@@ -20,7 +20,6 @@ NO_LATEST_LINK= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
libgsf_gnome ltverhack
USE_GETTEXT= yes
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 97ef9b0ef52b..74690d655950 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtranslator
PORTVERSION= 1.1.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,7 +18,6 @@ COMMENT= A GNOME application for creating GNU gettext translation files
LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell
-USE_XLIB= yes
USE_BZIP2= yes
USE_GNOME= gnomehack intlhack gnomeprefix gnometarget gnomevfs2 libgnomeui
USE_GMAKE= yes
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index 3a20c5e397dd..e3e6d9b25a44 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -20,8 +20,8 @@ USE_GCC= 3.2+
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
OPTIONS= SDL "Enable SDL support" On \
ALLEGRO "Enable Allegro support" Off \
diff --git a/devel/hs-tclhaskell-ghc/Makefile b/devel/hs-tclhaskell-ghc/Makefile
index ad725e292175..a4a000e448df 100644
--- a/devel/hs-tclhaskell-ghc/Makefile
+++ b/devel/hs-tclhaskell-ghc/Makefile
@@ -42,8 +42,8 @@ PKGINSTALL= ${WRKDIR}/pkg-install
MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" \
MKDIR="${MKDIR}" GHC="${GHC}"
MAKE_ARGS+= CC="${CC}" GHC="${GHC}" CC_OPTS="${CFLAGS}" \
- CC_INC="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3" \
- CCLIB="-L${X11BASE}/lib/X11 -L${LOCALBASE}/lib" \
+ CC_INC=" -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3" \
+ CCLIB="-L${LOCALBASE}/lib" \
IMPORTS="${GHC_LIB}/imports/tclhaskell" TCLLIBS="-ltk83 -ltcl83" \
TCL_REQ="-ltk83 -ltcl83" PREFIX="${GHC_LIB}"
diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 4e7f6759cc05..2a4fd5892604 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -20,7 +20,7 @@ COMMENT= International Components for Unicode (from IBM)
OPTIONS= THREADS "Build thread-safe version of the library" on
CONFLICTS= icu2-[0-9]*
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/icu/source
diff --git a/devel/icu4/Makefile b/devel/icu4/Makefile
index 4e7f6759cc05..2a4fd5892604 100644
--- a/devel/icu4/Makefile
+++ b/devel/icu4/Makefile
@@ -20,7 +20,7 @@ COMMENT= International Components for Unicode (from IBM)
OPTIONS= THREADS "Build thread-safe version of the library" on
CONFLICTS= icu2-[0-9]*
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/icu/source
diff --git a/devel/json-c/Makefile b/devel/json-c/Makefile
index c441243bd5ce..820b69f5bd31 100644
--- a/devel/json-c/Makefile
+++ b/devel/json-c/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://oss.metaparadigm.com/json-c/
MAINTAINER= gno@yahoo-inc.com
COMMENT= A JSON (Javascript Object Notation) implementation in C
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig gnomehack
diff --git a/devel/judy/Makefile b/devel/judy/Makefile
index bde708a9d3b7..03f41a34a6c6 100644
--- a/devel/judy/Makefile
+++ b/devel/judy/Makefile
@@ -16,7 +16,7 @@ COMMENT= General purpose dynamic array
GNU_CONFIGURE= yes
USE_GMAKE= YES
-INSTALLS_SHLIB= YES
+USE_LDCONFIG= YES
MAN3= Judy.3 Judy1.3 Judy1_funcs.3 JudyHS.3 JudyHS_funcs.3 \
JudyL.3 JudyL_funcs.3 JudySL.3 JudySL_funcs.3
diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile
index e7b2056fa5f5..30d336d47ddc 100644
--- a/devel/kaptain/Makefile
+++ b/devel/kaptain/Makefile
@@ -9,19 +9,19 @@
PORTNAME= kaptain
PORTVERSION= 0.72
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A tool for building/running QT GUIs for commmand line programs
+USE_XORG= x11 ice xext
USE_QT_VER= 3
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --enable-mt \
- --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+CONFIGURE_ARGS= --enable-mt
MAN1= kaptain.1
INFO= kaptain
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 4bf1d1ff3137..6b2aaa87d00a 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -42,7 +42,7 @@ USE_GMAKE= yes
USE_BDB= yes
USE_AUTOTOOLS= libtool:15 autotools:run
_NO_KDE_FINAL= yes
-CONFIGURE_ARGS+=--with-qtdoc-dir=${X11BASE}/share/doc/qt/html \
+CONFIGURE_ARGS+=--with-qtdoc-dir=${LOCALBSE}/share/doc/qt/html \
--with-db-includedir=${BDB_INCLUDE_DIR} \
--with-db-libdir=${BDB_LIB_DIR} --with-db-lib=${BDB_LIB_NAME} \
--with-apr-config=${LOCALBASE}/bin/apr-1-config \
diff --git a/devel/kxl/Makefile b/devel/kxl/Makefile
index 97a00e1d67d4..b0b5ee938ce6 100644
--- a/devel/kxl/Makefile
+++ b/devel/kxl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kxl
PORTVERSION= 1.1.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel games
MASTER_SITES= http://kxl.orz.hm/download/
DISTNAME= KXL-${PORTVERSION}
@@ -16,11 +16,10 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A visual, sound library for games
USE_AUTOTOOLS= libtool:15
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm x11
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
- LIBS="-L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index 7593fa7e80f7..3a78e3e88d3f 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kyra
PORTVERSION= 2.0.7
PORTREVISION= 6
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g}
MAINTAINER= ports@FreeBSD.org
@@ -26,8 +25,8 @@ USE_AUTOTOOLS= libtool:15
USE_SDL= image sdl
USE_GNOME= gnometarget lthack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
- LDFLAGS="-L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/leaktracer/Makefile b/devel/leaktracer/Makefile
index 58be8bdb919a..23222389cf52 100644
--- a/devel/leaktracer/Makefile
+++ b/devel/leaktracer/Makefile
@@ -15,7 +15,7 @@ DISTNAME= LeakTracer
MAINTAINER= danfe@FreeBSD.org
COMMENT= Trace and analyze memory leaks in C++ programs
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GMAKE= yes
USE_PERL5_RUN= yes
MAKE_ENV= CXX="${CXX}" \
diff --git a/devel/libafterbase/Makefile b/devel/libafterbase/Makefile
index 9b10ea265c64..d4c351adb1ae 100644
--- a/devel/libafterbase/Makefile
+++ b/devel/libafterbase/Makefile
@@ -8,16 +8,14 @@
PORTNAME= libafterbase
PORTVERSION= 0.92
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= afterstep
+MASTER_SITES= SF/afterstep
DISTNAME= libAfterBase-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= AfterStep basic functionality library
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-staticlibs --enable-sharedlibs --with-x
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index 400335c2fb0f..f1c0c00b2d51 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -7,9 +7,9 @@
PORTNAME= libassetml
PORTVERSION= 1.2.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= SF
MASTER_SITE_SUBDIR= ofset
MAINTAINER= gnome@FreeBSD.org
@@ -19,7 +19,6 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html
USE_AUTOTOOLS= libtool:15
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gnomeprefix gnometarget glib20 libxml2 pkgconfig
USE_GETTEXT= yes
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 9c0fa843bf14..9b7d1638fce1 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libast
PORTVERSION= 0.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://www.eterm.org/download/ \
CRITICAL
@@ -18,7 +18,6 @@ COMMENT= A library of assorted spiffy things
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_AUTOTOOLS= libtool:15
-USE_X_PREFIX= yes
USE_GNOME= gnomehack
USE_EFL= imlib2
GNU_CONFIGURE= yes
diff --git a/devel/libbegemot/Makefile b/devel/libbegemot/Makefile
index a2e1a49df560..8f27e67e7197 100644
--- a/devel/libbegemot/Makefile
+++ b/devel/libbegemot/Makefile
@@ -18,7 +18,7 @@ COMMENT= A function library for begemot tools
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_AUTOTOOLS= automake:19:env autoconf:261:env libltdl:15 libtool:15:env
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAN1= cstrc.1 frame.1 getfields.1 intro.1 panic.1 prstat.1 readline.1 \
diff --git a/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile
index 0797729b82ce..f51022a87866 100644
--- a/devel/libbonobomm/Makefile
+++ b/devel/libbonobomm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libbonobomm
PORTVERSION= 1.3.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -21,11 +21,10 @@ LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 \
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack libbonobo
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
post-patch:
diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile
index fd667067dc8a..22afa7b455f0 100644
--- a/devel/libchipcard/Makefile
+++ b/devel/libchipcard/Makefile
@@ -20,7 +20,7 @@ USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_TARGET=
CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
diff --git a/devel/libdict/Makefile b/devel/libdict/Makefile
index 876715fd428c..f214e81f1285 100644
--- a/devel/libdict/Makefile
+++ b/devel/libdict/Makefile
@@ -18,7 +18,7 @@ COMMENT= Library providing access to ``dictionary'' data structures
USE_GMAKE= yes
MAKEFILE= GNUmakefile
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
post-extract:
. for ___f in avl_insert.pdf empty.pdf treap_insert.pdf
diff --git a/devel/libdnsres/Makefile b/devel/libdnsres/Makefile
index aacdc01861e4..7bc41d575931 100644
--- a/devel/libdnsres/Makefile
+++ b/devel/libdnsres/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
diff --git a/devel/libds/Makefile b/devel/libds/Makefile
index 4066daa6d9c6..438a4e810b1e 100644
--- a/devel/libds/Makefile
+++ b/devel/libds/Makefile
@@ -15,7 +15,7 @@ DISTNAME= libds-2.1
MAINTAINER= kingofgib@users.sourceforge.net
COMMENT= ANSI Generic Data Structures Library
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
ALL_TARGET= gcc
.include <bsd.port.pre.mk>
diff --git a/devel/libevocosm/Makefile b/devel/libevocosm/Makefile
index f52132940a22..0e0939be0470 100644
--- a/devel/libevocosm/Makefile
+++ b/devel/libevocosm/Makefile
@@ -16,7 +16,7 @@ COMMENT= Collection of tools for creating a variety of evolutionary algorithms
LIB_DEPENDS= coyotl-3.1.4:${PORTSDIR}/devel/libcoyotl \
png.5:${PORTSDIR}/graphics/png
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= CPPFLAGS=-I${PREFIX}/include/ LDFLAGS=-L${PREFIX}/lib/
diff --git a/devel/libgconf-java/Makefile b/devel/libgconf-java/Makefile
index 3c15171ea0a1..3d3c05379b6a 100644
--- a/devel/libgconf-java/Makefile
+++ b/devel/libgconf-java/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgconf-java
PORTVERSION= 2.12.6
+PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -19,7 +20,6 @@ BUILD_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/
RUN_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java
USE_BZIP2= yes
-USE_XLIB= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/libglade-java/Makefile b/devel/libglade-java/Makefile
index 9e56a03aceb9..83d5dd2a6dbe 100644
--- a/devel/libglade-java/Makefile
+++ b/devel/libglade-java/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libglade-java
PORTVERSION= 2.12.8
+PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
@@ -22,7 +23,6 @@ RUN_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/li
${JAVALIBDIR}/gnome${GNOME_API_VERSION}.jar:${PORTSDIR}/x11/libgnome-java
USE_BZIP2= yes
-USE_XLIB= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index ec67a1faabf3..7444653064bc 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libglade
PORTVERSION= 0.17
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/libglade/0.17
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= sources/libglade/0.17
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME glade library
-USE_XLIB= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnomehier gnomedb
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 281d9863503a..0f67c5ad8ee5 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -7,9 +7,9 @@
PORTNAME= libglademm
PORTVERSION= 2.1.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= SF
MASTER_SITE_SUBDIR= gtkmm
DIST_SUBDIR= gnome2
@@ -19,11 +19,11 @@ COMMENT= C++ wrapper for libglade2 library
LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_XLIB= yes
+USE_XORG= x11 sm
USE_GMAKE= yes
USE_GNOME= gnomehack libglade2
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
post-patch:
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 9152d59a37a2..024ac25a8f14 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libglademm
PORTVERSION= 2.6.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -23,12 +23,11 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LATEST_LINK= libglademm24
USE_BZIP2= yes
-USE_XLIB= yes
+USE_XORG= x11 ice
USE_GMAKE= yes
-USE_GCC= 3.4+
USE_GNOME= gnomehack libglade2
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
PLIST_SUB= VERSION="2.4" API_VERSION="2.4"
diff --git a/devel/libgpc/Makefile b/devel/libgpc/Makefile
index 376211dbd6c8..3982edb3b241 100644
--- a/devel/libgpc/Makefile
+++ b/devel/libgpc/Makefile
@@ -18,7 +18,7 @@ USE_ZIP= yes
PLIST_FILES= lib/libgpc.so.2 \
lib/libgpc.so lib/libgpc.a \
include/gpc.h
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
NO_CDROM= Can't be used for profit without permission
MAKEFILE= ${FILESDIR}/BSDmakefile
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 1cdc52b31b86..65b43dacabde 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -8,9 +8,9 @@
PORTNAME= libgsf
PORTVERSION= 1.14.8
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= devel
-MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
@@ -21,7 +21,6 @@ COMMENT?= An extensible i/o abstraction for dealing with structured file formats
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif
-USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/devel/libisc/Makefile b/devel/libisc/Makefile
index fd9580ebb245..17a35b7b62bd 100644
--- a/devel/libisc/Makefile
+++ b/devel/libisc/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
MANCOMPRESSED= yes
BUILD_WRKSRC= ${WRKSRC}/lib/bind/freebsdportisc/
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAN3= assertions.3 eventlib.3 logging.3 tree.3 bitncmp.3 heap.3 \
memcluster.3
diff --git a/devel/libltdl15/Makefile b/devel/libltdl15/Makefile
index cc149825c132..0c0a63af1df2 100644
--- a/devel/libltdl15/Makefile
+++ b/devel/libltdl15/Makefile
@@ -10,7 +10,7 @@ MASTERDIR= ${.CURDIR}/../../devel/libtool15
COMMENT= System independent dlopen wrapper
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-ltdl-install
BUILD_WRKSRC= ${WRKSRC}/libltdl
INSTALL_WRKSRC= ${WRKSRC}/libltdl
diff --git a/devel/libmcve/Makefile b/devel/libmcve/Makefile
index 4cb86f34828f..d320519fbc1d 100644
--- a/devel/libmcve/Makefile
+++ b/devel/libmcve/Makefile
@@ -16,7 +16,7 @@ COMMENT= Library to allow credit card processing through MCVE
GNU_CONFIGURE= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --without-pthread
.include <bsd.port.mk>
diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile
index 5b19729c25b7..67b51e9a66e2 100644
--- a/devel/libmimedir/Makefile
+++ b/devel/libmimedir/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_BISON= build
USE_LDCONFIG= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
regression-test:
cd ${WRKSRC} && ./test
diff --git a/devel/libmonetra/Makefile b/devel/libmonetra/Makefile
index 4cb86f34828f..d320519fbc1d 100644
--- a/devel/libmonetra/Makefile
+++ b/devel/libmonetra/Makefile
@@ -16,7 +16,7 @@ COMMENT= Library to allow credit card processing through MCVE
GNU_CONFIGURE= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --without-pthread
.include <bsd.port.mk>
diff --git a/devel/libmtrie/Makefile b/devel/libmtrie/Makefile
index 37b25ce7de88..80b68780b52b 100644
--- a/devel/libmtrie/Makefile
+++ b/devel/libmtrie/Makefile
@@ -15,7 +15,7 @@ USE_BZIP2= yes
MAINTAINER= alfred@FreeBSD.org
COMMENT= A library to build an IP-netmask based mtrie.
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.if defined(NOPROFILE)
PLIST_SUB+= HURRRR="@comment "
diff --git a/devel/libpci/Makefile b/devel/libpci/Makefile
index 038f928c5b5f..ae1992e2aa60 100644
--- a/devel/libpci/Makefile
+++ b/devel/libpci/Makefile
@@ -19,7 +19,7 @@ COMMENT= PCI configuration space I/O made easy
USE_GMAKE= yes
NO_INSTALL_MANPAGES= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAKE_ENV= LANG=C
ALL_TARGET= lib/libpci.a
diff --git a/devel/libphish/Makefile b/devel/libphish/Makefile
index 4f2ad1a3ca01..49857900492c 100644
--- a/devel/libphish/Makefile
+++ b/devel/libphish/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= xmlwf:${PORTSDIR}/textproc/expat2
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GCC= 3.2+
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/devel/libpperl/Makefile b/devel/libpperl/Makefile
index 9acedc551138..95da97bdde34 100644
--- a/devel/libpperl/Makefile
+++ b/devel/libpperl/Makefile
@@ -18,7 +18,7 @@ COMMENT= A library easing embedding perl interpreters into C programs
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
USE_PERL5= 5.8.0+
diff --git a/devel/libs11n/Makefile b/devel/libs11n/Makefile
index 1769f11a3f34..606c32c327a7 100644
--- a/devel/libs11n/Makefile
+++ b/devel/libs11n/Makefile
@@ -19,7 +19,7 @@ COMMENT= A C++ library for easily serializing a wide variety of objects
WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_ZIP= yes
USE_GCC= 3.2+
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
post-extract:
@${CP} ${PATCHDIR}/Makefile.bsd ${WRKSRC}/Makefile
diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile
index 15c7b201a884..207592418151 100644
--- a/devel/libstatgrab/Makefile
+++ b/devel/libstatgrab/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= tdb@FreeBSD.org
COMMENT= Provides a useful interface to system statistics
DIST_SUBDIR= i-scream
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnometarget pkgconfig
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index 1cc322ac3181..45a50f226244 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -7,14 +7,14 @@
PORTNAME= libstroke
PORTVERSION= 0.5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://www.etla.net/libstroke/
MAINTAINER= ports@FreeBSD.org
COMMENT= A stroke translation library
-USE_XLIB= yes
+USE_XORG= x11
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
WANT_GNOME= yes
diff --git a/devel/libtai/Makefile b/devel/libtai/Makefile
index dbde8070e33f..b14a3faff41d 100644
--- a/devel/libtai/Makefile
+++ b/devel/libtai/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A library for storing and manipulating dates and times in second/attosecond
ALL_TARGET= it
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAKE_ENV= LIBVERSION="${LIBVERSION}"
PLIST_SUB= LIBVERSION=${LIBVERSION} \
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index e4382509b28d..d12299d2f7d3 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.usablelabs.com/download/
MAINTAINER= piyawat@usablelabs.com
COMMENT= Thai language support library
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_AUTOTOOLS= automake:15 autoconf:261 libtool:15
diff --git a/devel/libukcprog/Makefile b/devel/libukcprog/Makefile
index bc9185695ec8..7e2abf580829 100644
--- a/devel/libukcprog/Makefile
+++ b/devel/libukcprog/Makefile
@@ -24,7 +24,7 @@ USE_AUTOTOOLS= libtool:15
MAN3= ukcprog.3
DIST_SUBDIR= i-scream
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GNOME= gnomehack gnometarget pkgconfig lthack
.include <bsd.port.mk>
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 61405f074b42..f09858a54120 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -8,9 +8,9 @@
PORTNAME= libunicode
PORTVERSION= 0.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/libunicode/0.4
DISTNAME= ${PORTNAME}-${PORTVERSION}.gnome
@@ -19,7 +19,6 @@ COMMENT= A library for manipulating Unicode characters and strings
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
-USE_XLIB= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \
diff --git a/devel/libvanessa_adt/Makefile b/devel/libvanessa_adt/Makefile
index 714e16242d7b..16fd765765c7 100644
--- a/devel/libvanessa_adt/Makefile
+++ b/devel/libvanessa_adt/Makefile
@@ -17,7 +17,7 @@ COMMENT= Library that provides ADTs (queues, dynamic arrays and more)
LIB_DEPENDS= vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger
-INSTALLS_SHLIB= YES
+USE_LDCONFIG= YES
USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= YES
diff --git a/devel/libvanessa_logger/Makefile b/devel/libvanessa_logger/Makefile
index eb3ccfa54dab..345002246d95 100644
--- a/devel/libvanessa_logger/Makefile
+++ b/devel/libvanessa_logger/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= thomas@bsdunix.ch
COMMENT= Library that provides a generic logging layer
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= YES
+USE_LDCONFIG= YES
GNU_CONFIGURE= YES
post-patch:
diff --git a/devel/libvanessa_socket/Makefile b/devel/libvanessa_socket/Makefile
index 8a91144adea9..bdf09e493657 100644
--- a/devel/libvanessa_socket/Makefile
+++ b/devel/libvanessa_socket/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger \
MAN1= vanessa_socket_pipe.1
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= YES
+USE_LDCONFIG= YES
GNU_CONFIGURE= YES
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libvc/Makefile b/devel/libvc/Makefile
index 1ab615c37526..19138d1068b9 100644
--- a/devel/libvc/Makefile
+++ b/devel/libvc/Makefile
@@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
USE_BISON= build
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAN3= vc.3
diff --git a/devel/libytnef/Makefile b/devel/libytnef/Makefile
index ea98cb43578d..ac60f2c34b90 100644
--- a/devel/libytnef/Makefile
+++ b/devel/libytnef/Makefile
@@ -17,7 +17,7 @@ COMMENT= Unpack data in MS Outlook TNEF format
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/linux-allegro/Makefile b/devel/linux-allegro/Makefile
index e19998825d5c..aecaafecf585 100644
--- a/devel/linux-allegro/Makefile
+++ b/devel/linux-allegro/Makefile
@@ -18,7 +18,7 @@ COMMENT= Cross-platform game programming library (linux version)
USE_LINUX_RPM= yes
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_XLIB= yes
SRC_DISTFILES=
diff --git a/devel/linux-f10-allegro/Makefile b/devel/linux-f10-allegro/Makefile
index e19998825d5c..aecaafecf585 100644
--- a/devel/linux-f10-allegro/Makefile
+++ b/devel/linux-f10-allegro/Makefile
@@ -18,7 +18,7 @@ COMMENT= Cross-platform game programming library (linux version)
USE_LINUX_RPM= yes
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_XLIB= yes
SRC_DISTFILES=
diff --git a/devel/linux-f10-libglade/Makefile b/devel/linux-f10-libglade/Makefile
index 8bbd4275f8d5..4c057ecc2c90 100644
--- a/devel/linux-f10-libglade/Makefile
+++ b/devel/linux-f10-libglade/Makefile
@@ -16,7 +16,7 @@ COMMENT= RPM of libglade
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST= pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB= LIBVERSION="0.4.2" PORTVERSION="${PORTVERSION}"
diff --git a/devel/linux-f10-libglade2/Makefile b/devel/linux-f10-libglade2/Makefile
index b9c0c071b0ec..23b1d20ad914 100644
--- a/devel/linux-f10-libglade2/Makefile
+++ b/devel/linux-f10-libglade2/Makefile
@@ -15,7 +15,7 @@ COMMENT= RPM of libglade2
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST= pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB= LIBVERSION="0.0.7" PORTVERSION="${PORTVERSION}"
diff --git a/devel/linux-f10-libsigc++20/Makefile b/devel/linux-f10-libsigc++20/Makefile
index f7334b9f0f2f..f42831a19231 100644
--- a/devel/linux-f10-libsigc++20/Makefile
+++ b/devel/linux-f10-libsigc++20/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
RPMVERSION= 1
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS
.if defined(NOPORTDOCS)
diff --git a/devel/linux-f8-allegro/Makefile b/devel/linux-f8-allegro/Makefile
index e19998825d5c..aecaafecf585 100644
--- a/devel/linux-f8-allegro/Makefile
+++ b/devel/linux-f8-allegro/Makefile
@@ -18,7 +18,7 @@ COMMENT= Cross-platform game programming library (linux version)
USE_LINUX_RPM= yes
ONLY_FOR_ARCHS= i386 amd64
DIST_SUBDIR= rpm
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_XLIB= yes
SRC_DISTFILES=
diff --git a/devel/linux-f8-libglade/Makefile b/devel/linux-f8-libglade/Makefile
index 8bbd4275f8d5..4c057ecc2c90 100644
--- a/devel/linux-f8-libglade/Makefile
+++ b/devel/linux-f8-libglade/Makefile
@@ -16,7 +16,7 @@ COMMENT= RPM of libglade
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST= pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB= LIBVERSION="0.4.2" PORTVERSION="${PORTVERSION}"
diff --git a/devel/linux-f8-libglade2/Makefile b/devel/linux-f8-libglade2/Makefile
index b9c0c071b0ec..23b1d20ad914 100644
--- a/devel/linux-f8-libglade2/Makefile
+++ b/devel/linux-f8-libglade2/Makefile
@@ -15,7 +15,7 @@ COMMENT= RPM of libglade2
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST= pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB= LIBVERSION="0.0.7" PORTVERSION="${PORTVERSION}"
diff --git a/devel/linux-f8-libsigc++20/Makefile b/devel/linux-f8-libsigc++20/Makefile
index f7334b9f0f2f..f42831a19231 100644
--- a/devel/linux-f8-libsigc++20/Makefile
+++ b/devel/linux-f8-libsigc++20/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
RPMVERSION= 1
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS
.if defined(NOPORTDOCS)
diff --git a/devel/linux-glib2/Makefile b/devel/linux-glib2/Makefile
index 2b3a44d9d737..e7a8a4cb0e14 100644
--- a/devel/linux-glib2/Makefile
+++ b/devel/linux-glib2/Makefile
@@ -15,7 +15,7 @@ COMMENT= Version 2.X Linux/i386 binary port of GLib
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64
PLIST_SUB+= LIBVERSION="600.6" PORTVERSION="${PORTVERSION}"
diff --git a/devel/linux-libglade/Makefile b/devel/linux-libglade/Makefile
index 8bbd4275f8d5..4c057ecc2c90 100644
--- a/devel/linux-libglade/Makefile
+++ b/devel/linux-libglade/Makefile
@@ -16,7 +16,7 @@ COMMENT= RPM of libglade
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST= pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB= LIBVERSION="0.4.2" PORTVERSION="${PORTVERSION}"
diff --git a/devel/linux-libglade2/Makefile b/devel/linux-libglade2/Makefile
index b9c0c071b0ec..23b1d20ad914 100644
--- a/devel/linux-libglade2/Makefile
+++ b/devel/linux-libglade2/Makefile
@@ -15,7 +15,7 @@ COMMENT= RPM of libglade2
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST= pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB= LIBVERSION="0.0.7" PORTVERSION="${PORTVERSION}"
diff --git a/devel/linux-libsigc++20/Makefile b/devel/linux-libsigc++20/Makefile
index f7334b9f0f2f..f42831a19231 100644
--- a/devel/linux-libsigc++20/Makefile
+++ b/devel/linux-libsigc++20/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
RPMVERSION= 1
LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MASTER_SITE_SRC_SUBDIR= ../extras/${LINUX_DIST_VER}/SRPMS
.if defined(NOPORTDOCS)
diff --git a/devel/linux-runrev/Makefile b/devel/linux-runrev/Makefile
index ab24633b4acd..b41f844d51fd 100644
--- a/devel/linux-runrev/Makefile
+++ b/devel/linux-runrev/Makefile
@@ -25,7 +25,7 @@ NO_CDROM= "Sale for profit is not permitted"
ONLY_FOR_ARCHS= i386
NO_BUILD= yes
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
WRKSRC= ${WRKDIR}/Revolution-${PORTVERSION}
DATADIR= ${PREFIX}/share/Revolution-${PORTVERSION}
diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index cc9e861a507f..45cf39522eea 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= petri.totterman@hmv.fi
COMMENT= A logging library for C++
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile
index b9438e4868ab..31f6808001b8 100644
--- a/devel/log4cxx/Makefile
+++ b/devel/log4cxx/Makefile
@@ -38,7 +38,7 @@ LDFLAGS+= -I${LOCALBASE}/lib
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.if !defined(NOPORTDOCS) && defined(WITH_DOXYGEN)
PORTDOCS= *
diff --git a/devel/lrmi/Makefile b/devel/lrmi/Makefile
index 00270a7f5deb..b90b0da38beb 100644
--- a/devel/lrmi/Makefile
+++ b/devel/lrmi/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= amistry@am-productions.biz
COMMENT= LRMI is a library for calling real mode BIOS routines
ONLY_FOR_ARCHS= i386
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAKEFILE= Makefile.bsd
SHLIB_VERSION= 0
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index 8dd9adcc2700..c184e134dbe5 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mico
PORTVERSION= 2.3.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://www.mico.org/
@@ -19,7 +19,7 @@ COMMENT= Secure, reliable, production-quality, standards-based CORBA middleware
PATCH_DIST_STRIP= -p1
WRKSRC= ${WRKDIR}/${PORTNAME}
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf:261
@@ -62,7 +62,7 @@ MICO_SERVICE= "@comment "
CONFIGURE_ENV+= CXXFLAGS="${CPPFLAGS} -Wno-unused"
.if defined(WITH_X11)
-USE_XLIB= yes
+USE_XORG= x11
CONFIGURE_ARGS+= --with-x
.else
CONFIGURE_ARGS+= --without-x
diff --git a/devel/mimir/Makefile b/devel/mimir/Makefile
index 163e136f8a04..fbf40293a385 100644
--- a/devel/mimir/Makefile
+++ b/devel/mimir/Makefile
@@ -17,6 +17,6 @@ COMMENT= Data-structure library used by the Elan Programming Environment
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index 7dffdd489a9b..c1ab96edc1aa 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -61,7 +61,7 @@ post-install:
add-plist-post:
@${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//}/info 2> /dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST}
-.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
+.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
.else
@${DO_NADA}
diff --git a/devel/mpatrol/Makefile b/devel/mpatrol/Makefile
index 57a5b80fb9bd..78b7199073ad 100644
--- a/devel/mpatrol/Makefile
+++ b/devel/mpatrol/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= elf.0:${PORTSDIR}/devel/libelf
WRKSRC= ${WRKDIR}/${PORTNAME}/build/unix
ONLY_FOR_ARCHS= i386 amd64
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GMAKE= yes
MAKE_ENV= LOCALBASE="${LOCALBASE}" CXX="${CXX}" \
diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile
index 1b6007e35964..c50cc1fdf93c 100644
--- a/devel/msp430-binutils/Makefile
+++ b/devel/msp430-binutils/Makefile
@@ -56,7 +56,7 @@ post-install:
add-plist-post:
@${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//}/info 2> /dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST}
-.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
+.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
.else
@${DO_NADA}
diff --git a/devel/ncnf/Makefile b/devel/ncnf/Makefile
index cab3215b37dd..eb9fb76fc66d 100644
--- a/devel/ncnf/Makefile
+++ b/devel/ncnf/Makefile
@@ -18,7 +18,7 @@ COMMENT= Generic configuration management library
LIB_DEPENDS= strfunc.9:${PORTSDIR}/devel/libstrfunc
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= YES
+USE_LDCONFIG= YES
GNU_CONFIGURE= yes
post-patch:
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 61923ed8ef2e..a7823d8e27b1 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -8,9 +8,9 @@
PORTNAME= oaf
PORTVERSION= 0.6.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/oaf/0.6
DIST_SUBDIR= gnome
@@ -21,7 +21,6 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
-USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gtk12 orbit libxml
USE_GETTEXT= yes
diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile
index 95eff8a45dec..0e4a03b8bfae 100644
--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@@ -10,7 +10,7 @@ PORTNAME= sdl
PORTVERSION= 0.7.2
PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= SF
MASTER_SITE_SUBDIR= ocamlsdl
PKGNAMEPREFIX= ocaml-
DISTNAME= ocamlsdl-${PORTVERSION}
@@ -26,8 +26,8 @@ USE_OCAML_FINDLIB=yes
USE_OCAML_LDCONFIG=yes
USE_SDL= sdl ttf image mixer
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-findlib
DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME}
diff --git a/devel/ode-devel/Makefile b/devel/ode-devel/Makefile
index b0b07134efc9..9756942c28d4 100644
--- a/devel/ode-devel/Makefile
+++ b/devel/ode-devel/Makefile
@@ -36,8 +36,8 @@ post-patch:
${WRKSRC}/configurator.c
@${REINPLACE_CMD} -e 's|g++|${CXX}|; s|-Wall||g; s|-L/usr/X11/lib|-lXext|; \
- s|-L/usr/lib/X11R6||; s|-L/usr/lib/X11||; s|-L/usr/X11R6/lib|-L${X11BASE}/lib|; \
- s|-fno-rtti||; s|-ffast-math|${CXXFLAGS} -I${X11BASE}/include|' \
+ s|-L/usr/lib/X11R6||; s|-L/usr/lib/X11||; s|-L/usr/X11R6/lib|-L${LOCALBASE}/lib|; \
+ s|-fno-rtti||; s|-ffast-math|${CXXFLAGS} -I${LOCALBASE}/include|' \
${WRKSRC}/config/makefile.unix-gcc
.if !defined(WITHOUT_OPCODE)
@${REINPLACE_CMD} -e 's/^#OPCODE_DIRECTORY/OPCODE_DIRECTORY/' \
diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index d511034b2f13..20d07722e719 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.9
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= SF
MASTER_SITE_SUBDIR= opende
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
@@ -25,8 +25,8 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
- LIBS="-L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
OPTIONS= GIMPACT "Enable gimpact instead of opcode support" off \
GYROSCOPIC "Configure ODE to work with gyroscopic term" on \
diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile
index 8eb27650f89e..4b3a651f00a8 100644
--- a/devel/omniNotify/Makefile
+++ b/devel/omniNotify/Makefile
@@ -29,7 +29,7 @@ USE_PYTHON= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKEFILE= GNUmakefile
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
# Don't compiled on != i386
ONLY_FOR_ARCHS= i386
diff --git a/devel/ossp-al/Makefile b/devel/ossp-al/Makefile
index 3918db68fd43..a89e5bf3275f 100644
--- a/devel/ossp-al/Makefile
+++ b/devel/ossp-al/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ex=${LOCALBASE}
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
check: build
@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
diff --git a/devel/ossp-ex/Makefile b/devel/ossp-ex/Makefile
index 6f5a4e90ea16..e382764031de 100644
--- a/devel/ossp-ex/Makefile
+++ b/devel/ossp-ex/Makefile
@@ -18,7 +18,7 @@ COMMENT= OSSP ex is a small exception handling library for use in C
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/devel/ossp-val/Makefile b/devel/ossp-val/Makefile
index d66cc2eab42a..0f7afcaab4dd 100644
--- a/devel/ossp-val/Makefile
+++ b/devel/ossp-val/Makefile
@@ -18,7 +18,7 @@ COMMENT= A flexible name to value mapping library for C variables
LIB_DEPENDS= ex.10:${PORTSDIR}/devel/ossp-ex
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ex=${LOCALBASE}
diff --git a/devel/ossp-var/Makefile b/devel/ossp-var/Makefile
index 4c5409a36677..cb261a02e8a2 100644
--- a/devel/ossp-var/Makefile
+++ b/devel/ossp-var/Makefile
@@ -18,7 +18,7 @@ COMMENT= A flexible, full-featured and fast variable expansion library
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/devel/ossp-xds/Makefile b/devel/ossp-xds/Makefile
index d2a82b9aeb06..25e8f946dc83 100644
--- a/devel/ossp-xds/Makefile
+++ b/devel/ossp-xds/Makefile
@@ -17,7 +17,7 @@ COMMENT= A generic and extensible framework for serialization
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAN1= xds-config.1
MAN3= xds.3
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index 42cc87652fcc..edac286068d8 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -47,7 +47,7 @@ BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
.endif
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
INSTALL_TARGET= pure_install
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile
index 719314ea7f81..0217b5f0eb66 100644
--- a/devel/physfs/Makefile
+++ b/devel/physfs/Makefile
@@ -16,6 +16,6 @@ COMMENT= A library to provide abstract access to various archives
USE_GNOME= gnometarget
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/pikdev/Makefile b/devel/pikdev/Makefile
index 005487b77cd5..f14c9001c835 100644
--- a/devel/pikdev/Makefile
+++ b/devel/pikdev/Makefile
@@ -26,8 +26,8 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
INSTALLS_ICONS= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
-CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
CONFIGURE_ARGS+= --with-pic=yes
MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
diff --git a/devel/plan9port/Makefile b/devel/plan9port/Makefile
index e25cbb2f0cc9..08a9b5238898 100644
--- a/devel/plan9port/Makefile
+++ b/devel/plan9port/Makefile
@@ -7,6 +7,7 @@
PORTNAME= plan9port
PORTVERSION= 20080409
+PORTREVISION= 1
CATEGORIES= devel plan9
MASTER_SITES= http://swtch.com/plan9port/ \
ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/
@@ -15,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= serge.gagnon.1@ulaval.ca
COMMENT= Port of the bulk of the Plan9 software build environment to Unix
-USE_XLIB= YES
+USE_XORG= x11 xt xi xaw6 xaw7 xaw8
USE_PERL5_BUILD=YES
WRKSRC= ${WRKDIR}/plan9
PLIST= ${WRKDIR}/.PLIST
diff --git a/devel/poslib/Makefile b/devel/poslib/Makefile
index 01391d5bda0b..8ac0511d565c 100644
--- a/devel/poslib/Makefile
+++ b/devel/poslib/Makefile
@@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST_SUB= VERSION="${PORTVERSION}"
diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile
index 237247c0cdb4..d87176bc7e3a 100644
--- a/devel/prepstools/Makefile
+++ b/devel/prepstools/Makefile
@@ -25,6 +25,6 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+=--with-pgsqldir=${LOCALBASE} --with-plpgsqldir=${LOCALBASE}
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/ptypes/Makefile b/devel/ptypes/Makefile
index 1a79b11b9a52..5a2e8cfb84e9 100644
--- a/devel/ptypes/Makefile
+++ b/devel/ptypes/Makefile
@@ -17,7 +17,7 @@ COMMENT= C++ Portable Types Library
SHLIB_VER= 21
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST_SUB+= SHLIB_VER=${SHLIB_VER}
PTYPES_CFLAGS= ${CFLAGS}
diff --git a/devel/py-libgsf/Makefile b/devel/py-libgsf/Makefile
index 33106fe8525d..601400158634 100644
--- a/devel/py-libgsf/Makefile
+++ b/devel/py-libgsf/Makefile
@@ -21,8 +21,8 @@ USE_GNOME= gnomehack libgsf_gnome gnomevfs2 ltverhack intlhack pygtk2
USE_PYTHON= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \
--disable-gtk-doc --with-bz2 --with-gnome --with-python
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
- LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS=
GSF_SLAVE= yes
diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile
index 79ee89a4172e..83d25446262f 100644
--- a/devel/py-notify/Makefile
+++ b/devel/py-notify/Makefile
@@ -7,7 +7,7 @@
PORTNAME= notify
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX=python-
CATEGORIES= devel python
MASTER_SITES= http://www.galago-project.org/files/releases/source/notify-python/
@@ -18,7 +18,6 @@ COMMENT= A python bindings for libnotify
LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify
-USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget pygtk2
diff --git a/devel/py-ode/Makefile b/devel/py-ode/Makefile
index 288f46a8a2eb..b2a76bdd6ba6 100644
--- a/devel/py-ode/Makefile
+++ b/devel/py-ode/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR= python
MAINTAINER= amdmi3@amdmi3.ru
COMMENT= Python bindings for The Open Dynamics Engine
-BUILD_DEPENDS= ${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode
+BUILD_DEPENDS= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode
USE_BZIP2= yes
@@ -33,7 +33,7 @@ OPTIONS= TRIMESH "Trimesh support (sync with OPCODE opt of devel/ode)" on
.include <bsd.port.pre.mk>
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/local|${X11BASE}|' ${WRKSRC}/setup.py
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/setup.py
.if defined(WITHOUT_TRIMESH)
@${REINPLACE_CMD} -e '/TRIMESH_ENABLE/ s|True|False|' ${WRKSRC}/setup.py
.endif
diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile
index 4c1a10a0967b..8e4d20422239 100644
--- a/devel/py-omniorb/Makefile
+++ b/devel/py-omniorb/Makefile
@@ -36,7 +36,7 @@ USE_GMAKE= yes
USE_OPENSSL= yes
GNU_CONFIGURE= yes
MAKEFILE= GNUmakefile
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_SCRIPT= ../configure
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index d2fc6e9e05ce..a00dd382a428 100644
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@@ -6,7 +6,7 @@
PORTNAME= dbus
PORTVERSION= ${PYQT4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
@@ -25,6 +25,7 @@ HAS_CONFIGURE= yes
USE_PYTHON= 2.5+
USE_QT_VER= 4
QT_COMPONENTS= corelib qmake moc
+USE_XORG= x11 xext
OPTIONS= DEBUG "Enable debugging in generated code" off \
TRACING "Enable tracing in generated code" off
diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile
index 6336dcd36112..eaeb1c63cf5e 100644
--- a/devel/qmake/Makefile
+++ b/devel/qmake/Makefile
@@ -45,7 +45,7 @@ post-patch:
-e 's|gcc|${CC}|' \
-e 's|g++|${CXX}|' \
-e 's|/usr/local|${LOCALBASE}|' \
- -e 's|/usr/X11R6|${X11BASE}|' \
+ -e 's|/usr/X11R6|${LOCALBASE}|' \
-e 's|release|release thread|' \
-e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
-e 's|-pthread|${PTHREAD_LIBS}|' \
diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile
index b92c33122d96..0a177f54423f 100644
--- a/devel/qmake4/Makefile
+++ b/devel/qmake4/Makefile
@@ -53,7 +53,7 @@ post-patch:
-e 's|gcc.*|${CC}|' \
-e 's|g++.*|${CXX}|' \
-e 's|/usr/local|${LOCALBASE}|' \
- -e 's|/usr/X11R6|${X11BASE}|' \
+ -e 's|/usr/X11R6|${LOCALBASE}|' \
-e 's|release|release thread|' \
-e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
-e 's|-pthread|${PTHREAD_LIBS}|' \
diff --git a/devel/qsa/Makefile b/devel/qsa/Makefile
index 0ad7dcf82cfb..cf90c5083487 100644
--- a/devel/qsa/Makefile
+++ b/devel/qsa/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
USE_QT_VER= 3
QT_NONSTANDARD= yes
HAS_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS=-prefix ${PREFIX}
CONFIGURE_ENV?= QTDIR=${QT_PREFIX} QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ PATH=${WRKSRC}/bin:$$PATH
diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index 79806c2583a2..188ab0c76402 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qt3support
PORTVERSION= ${QT4_VERSION}
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES?= devel x11-toolkits
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -25,7 +25,7 @@ QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_XLIB= yes
+USE_XORG= x11
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile
index c2dae7cadf67..27d5ffe61235 100644
--- a/devel/qt4-uic3/Makefile
+++ b/devel/qt4-uic3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= uic3
PORTVERSION= ${QT4_VERSION}
-PORTREVISION=0
+PORTREVISION= 1
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -22,6 +22,7 @@ USE_QT_VER= 4
QT_COMPONENTS= qmake_build qt3support corelib gui network sql xml
QT_NONSTANDARD= yes
QT_DIST= yes
+USE_XORG= sm ice xrender xrandr xfixes xcursor xinerama xi
HAS_CONFIGURE= yes
diff --git a/devel/rhtvision/Makefile b/devel/rhtvision/Makefile
index b0f21bd218ed..b3183c1bf80a 100644
--- a/devel/rhtvision/Makefile
+++ b/devel/rhtvision/Makefile
@@ -7,9 +7,9 @@
PORTNAME= rhtvision
PORTVERSION= 2.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= SF
MASTER_SITE_SUBDIR= tvision
DISTNAME= rhtvision-${PORTVERSION}.src
@@ -19,7 +19,7 @@ COMMENT= Complete C++ Text User Interface (TUI) library
WRKSRC= ${WRKDIR}/tvision
USE_PERL5= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
@@ -30,9 +30,9 @@ USE_GETTEXT= yes
.endif
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= x11 xrender xmu sm xt ice
PLIST_SUB+= X11_ONLY=""
-CFLAGS+= -I${X11BASE}/include
+CFLAGS+= -I${LOCALBASE}/include
.else
PLIST_SUB+= X11_ONLY="@comment "
@@ -44,7 +44,7 @@ post-patch:
.for f in config.pl confignt.pl conflib.pl linux/compress Makefile.in
@${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL5},g' \
-e 's,/usr/local,${LOCALBASE},g' \
- -e 's,/usr/X11R6,${X11BASE},g' \
+ -e 's,/usr/X11R6,${LOCALBASE},g' \
-e 's,\(soname.*\)Version,\1VersionMajor,g' \
-e 's/\tmake/\t\\$$(MAKE)/g' \
-e 's/ make/ $$(MAKE)/g' \
diff --git a/devel/root/Makefile b/devel/root/Makefile
index 5522b9eb601c..14fe3d99f05b 100644
--- a/devel/root/Makefile
+++ b/devel/root/Makefile
@@ -7,7 +7,7 @@
PORTNAME= root
PORTVERSION= 5.02.00
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel science math
MASTER_SITES= ftp://root.cern.ch/root/
DISTNAME= ${PORTNAME}_v${PORTVERSION}.source
@@ -36,9 +36,8 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_XLIB= yes
-USE_XPM= yes
-USE_GL= yes
+USE_XORG= xpm x11
+USE_GL= gl
USE_GNOME= libxml2
# A lot of additional features are most likely used in high energy physics
@@ -84,7 +83,7 @@ CONFIGURE_ARGS= ${CONFIGURE_TARGET} \
--enable-xml \
--enable-xrootd
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
LDCONFIG_DIRS= %%PREFIX%%/lib/root %%PREFIX%%/lib/root/cint
MAN1= cint.1 g2root.1 g2rootold.1 h2root.1 hadd.1 makecint.1
MAN1+= memprobe.1 olbd.1 proofd.1 proofserv.1 rlibmap.1
@@ -260,7 +259,7 @@ post-patch:
s|auxlibs=\"PTHREAD-LIBS|auxlibs=\"${PTHREAD_LIBS}|' \
${WRKSRC}/config/root-config.in
@${REINPLACE_CMD} -e \
- 's|/usr/X11R6|${X11BASE}|g' \
+ 's|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/configure \
${WRKSRC}/cint/lib/gl/setup \
${WRKSRC}/cint/lib/xlib/setup \
diff --git a/devel/root/files/patch-asimage-Module.mk b/devel/root/files/patch-asimage-Module.mk
index dc39ede59357..41908f0c1900 100644
--- a/devel/root/files/patch-asimage-Module.mk
+++ b/devel/root/files/patch-asimage-Module.mk
@@ -4,7 +4,7 @@
--with-ttf $$TTFINCDIR \
--with-afterbase=no \
--disable-glx \
-+ --x-libraries=$(X11BASE)/lib --x-includes=$(X11BASE)/include \
++ --x-libraries=$(LOCALBASE)/lib --x-includes=$(LOCALBASE)/include \
$$MMX \
$(ASTEPDBG) \
--with-builtin-ungif \
diff --git a/devel/rote/Makefile b/devel/rote/Makefile
index d8874d6bf87e..33b6e53e2306 100644
--- a/devel/rote/Makefile
+++ b/devel/rote/Makefile
@@ -16,7 +16,7 @@ COMMENT= A simple library for VT102 terminal emulation
GNU_CONFIGURE= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST_FILES= bin/rote-config include/rote/rote.h lib/librote.so.${PORTVERSION} \
lib/librote.so.0 lib/librote.so
diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile
index c06ec5da85d4..d1ff12c05e43 100644
--- a/devel/ruby-sdl/Makefile
+++ b/devel/ruby-sdl/Makefile
@@ -28,7 +28,7 @@ USE_RUBY_EXTCONF= yes
CONFIGURE_ARGS= --with-sdl-config="sdl-config" \
--enable-opengl --linkoglmodule \
- --with-x11-dir="${X11BASE}"
+ --with-x11-dir="${LOCALBASE}"
INSTALL_TARGET= site-install
RUBY_RD_FILES= rubysdl_doc.en.rd \
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index 8d93a962ed7e..25fc834905f1 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -15,16 +15,16 @@ MASTER_SITES= ftp://ftp.simgear.org/pub/simgear/Source/ \
MAINTAINER= jylefort@FreeBSD.org
COMMENT= A toolkit for 3D games and simulations
-BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
+BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
+RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \
jpeg.9:${PORTSDIR}/graphics/jpeg \
alut.1:${PORTSDIR}/audio/freealut
USE_GL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-jpeg-factory
post-patch:
diff --git a/devel/st/Makefile b/devel/st/Makefile
index bfa18696c0c1..9b8db8d7430e 100644
--- a/devel/st/Makefile
+++ b/devel/st/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= state-threads
MAINTAINER= alfred@FreeBSD.org
COMMENT= State Threads Library for Internet Applications
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 alpha amd64
.include <bsd.port.pre.mk>
diff --git a/devel/str/Makefile b/devel/str/Makefile
index 2e17f00d2265..3784bde130de 100644
--- a/devel/str/Makefile
+++ b/devel/str/Makefile
@@ -16,7 +16,7 @@ COMMENT= Generic String Library
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAN1= str-config.1
MAN3= str.3
diff --git a/devel/subcommander/Makefile b/devel/subcommander/Makefile
index 86644da547fb..891e63692428 100644
--- a/devel/subcommander/Makefile
+++ b/devel/subcommander/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_QT_VER= 3
CONFIGURE_ARGS+= --with-boost=${LOCALBASE}
CONFIGURE_ARGS+= --with-neon=${LOCALBASE}
-CONFIGURE_ENV= QTDIR=${X11BASE} CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
.include <bsd.port.mk>
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index 86644da547fb..891e63692428 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_QT_VER= 3
CONFIGURE_ARGS+= --with-boost=${LOCALBASE}
CONFIGURE_ARGS+= --with-neon=${LOCALBASE}
-CONFIGURE_ENV= QTDIR=${X11BASE} CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
.include <bsd.port.mk>
diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 9378370948a9..213d6d8b0a27 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.19
PORTREVISION= 2
DISTVERSIONPREFIX= src-
CATEGORIES= devel tcl tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= otcl-tclcl
+MASTER_SITES= SF/otcl-tclcl
MAINTAINER= mm@FreeBSD.org
COMMENT= Tcl/C++ interface used by ns and nam
@@ -20,6 +19,7 @@ LIB_DEPENDS= otcl:${PORTSDIR}/lang/otcl
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_XORG= x11
USE_AUTOTOOLS= autoconf:261
GNU_CONFIGURE= yes
@@ -39,8 +39,7 @@ USE_TK= 80+
.include "${PORTSDIR}/Mk/bsd.tcl.mk"
-CONFIGURE_ARGS= --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} \
- --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+CONFIGURE_ARGS= --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER}
post-patch:
@${REINPLACE_CMD} -e 's|exec tclsh|exec ${TCLSH}|g' ${WRKSRC}/otcldoc
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index 557dd87c14af..1511934bd528 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tclreadline
PORTVERSION= 2.1.0
PORTREVISION= 2
CATEGORIES= devel tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tclreadline
+MASTER_SITES= SF/tclreadline
MAINTAINER= ports@FreeBSD.org
COMMENT= GNU readline for TCL
@@ -18,7 +17,7 @@ COMMENT= GNU readline for TCL
USE_TCL= 80+
USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MANN= tclreadline.n
PLIST_SUB+= VERSION="${PORTVERSION}"
diff --git a/devel/tclxml/Makefile b/devel/tclxml/Makefile
index 89baed5a6ea4..0c57ebdf38d7 100644
--- a/devel/tclxml/Makefile
+++ b/devel/tclxml/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= tclsh8.4:${PORTSDIR}/lang/tcl84 \
dtplite:${PORTSDIR}/devel/tcllib
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.4 \
--with-tclinclude=${LOCALBASE}/include/tcl8.4
PLIST_SUB= VER=${PORTVERSION}
diff --git a/devel/tinyq/Makefile b/devel/tinyq/Makefile
index 13319790a4fa..96df12691f64 100644
--- a/devel/tinyq/Makefile
+++ b/devel/tinyq/Makefile
@@ -30,7 +30,7 @@ post-patch:
-e 's|gcc|${CC}|' \
-e 's|g++|${CXX}|' \
-e 's|/usr/local|${LOCALBASE}|' \
- -e 's|/usr/X11R6|${X11BASE}|' \
+ -e 's|/usr/X11R6|${LOCALBASE}|' \
-e 's|release|release thread|' \
-e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
-e 's|-pthread|${PTHREAD_LIBS}|' \
diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile
index fb51d095984a..634076da8a1a 100644
--- a/devel/tmake/Makefile
+++ b/devel/tmake/Makefile
@@ -23,7 +23,7 @@ REINPLACE_ARGS= -i "" # no backup (for install)
post-patch:
@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g; \
- s,/usr/X11R6,${X11BASE},g' \
+ s,/usr/X11R6,${LOCALBASE},g' \
${WRKSRC}/lib/freebsd-g++/tmake.conf
do-install:
diff --git a/devel/upp/Makefile b/devel/upp/Makefile
index 7e6de37946f7..10566cff2e2e 100644
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@@ -9,18 +9,16 @@ PORTNAME= upp
PORTVERSION= 2007.1
PORTREVISION= 3
CATEGORIES= devel x11-toolkits
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF
MAINTAINER= m.sund@arcor.de
COMMENT= Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
-LIB_DEPENDS= Xft:${PORTSDIR}/x11-fonts/libXft\
- freetype.9:${PORTSDIR}/print/freetype2\
- expat.6:${PORTSDIR}/textproc/expat2\
- gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
+ expat.6:${PORTSDIR}/textproc/expat2
+USE_XORG= xft
+USE_GNOME= gtk20
USE_GMAKE= yes
.if defined(WITH_SDL)
@@ -56,8 +54,8 @@ post-build:
@${ECHO_CMD} "RELEASE_OPTIONS = \"-O3 -ffunction-sections\";" >> ${WRKSRC}/GCC.bm
@${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC.bm
@${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC.bm
- @${ECHO_CMD} "INCLUDE = \"${X11BASE}/include;${LOCALBASE}/include;${LOCALBASE}/include/freetype2;${LOCALBASE}/include/gtk-2.0;${LOCALBASE}/include/glib-2.0;${LOCALBASE}/include/cairo;${LOCALBASE}/include/pango-1.0;${LOCALBASE}/include/atk-1.0\";" >> ${WRKSRC}/GCC.bm
- @${ECHO_CMD} "LIB = \"${X11BASE}/lib;${LOCALBASE}/lib\";" >> ${WRKSRC}/GCC.bm
+ @${ECHO_CMD} "INCLUDE = \"${LOCALBASE}/include;${LOCALBASE}/include/freetype2;${LOCALBASE}/include/gtk-2.0;${LOCALBASE}/include/glib-2.0;${LOCALBASE}/include/cairo;${LOCALBASE}/include/pango-1.0;${LOCALBASE}/include/atk-1.0\";" >> ${WRKSRC}/GCC.bm
+ @${ECHO_CMD} "LIB = \"${LOCALBASE}/lib\";" >> ${WRKSRC}/GCC.bm
@${ECHO_CMD} "REMOTE_HOST = \"\";" >> ${WRKSRC}/GCC.bm
@${ECHO_CMD} "REMOTE_OS = \"\";" >> ${WRKSRC}/GCC.bm
@${ECHO_CMD} "REMOTE_TRANSFER = \"\";" >> ${WRKSRC}/GCC.bm
diff --git a/devel/upp/files/patch-uppsrc-ide-Makefile b/devel/upp/files/patch-uppsrc-ide-Makefile
index 17ca6944eb0b..3bb69074b02f 100644
--- a/devel/upp/files/patch-uppsrc-ide-Makefile
+++ b/devel/upp/files/patch-uppsrc-ide-Makefile
@@ -10,11 +10,11 @@
-C_FLAGS = $(CC) -x c
-CPPFLAGS = $(CC) -x c++
-LIBPATH = -L"/usr/X11R6/lib"
-+CINC = -I$(UPPDIR1) -I$(X11BASE)/include -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0
++CINC = -I$(UPPDIR1) -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0
+Macro = -DflagGUI -DflagGCC -DflagSHARED -DflagFREEBSD
+C_FLAGS = $(CC) -x c -c $(CFLAGS)
+CPPFLAGS = $(CC) -x c++ -c $(CXXFLAGS)
-+LIBPATH = -L$(X11BASE)/lib -L$(LOCALBASE)/lib
++LIBPATH = -L$(LOCALBASE)/lib
AR = ar -sr
OutDir_ide = $(UPPOUT)ide/GCC-Gcc-Gui-Linux-Main-Shared/
Macro_ide = $(Macro) -DflagMAIN
diff --git a/devel/wininfo/Makefile b/devel/wininfo/Makefile
index d99880f2316b..c9ac59326e87 100644
--- a/devel/wininfo/Makefile
+++ b/devel/wininfo/Makefile
@@ -7,18 +7,20 @@
PORTNAME= wininfo
PORTVERSION= 0.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= http://www.freedesktop.org/software/wininfo/
MAINTAINER= jylefort@FreeBSD.org
COMMENT= A window information utility
-USE_GNOME= gtk20 gnomeprefix
+USE_XORG= xext xrender xinerama xrandr xi xfixes xcursor \
+ xcomposite x11 xres
+USE_GNOME= gtk20 gnomeprefix pkgconfig
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
MAN1= wininfo.1
diff --git a/devel/xfc/Makefile b/devel/xfc/Makefile
index 533c1f495c70..d7a916d7e198 100644
--- a/devel/xfc/Makefile
+++ b/devel/xfc/Makefile
@@ -22,7 +22,7 @@ USE_GETTEXT= yes
USE_GCC= 3.4+
USE_GNOME= glib20 gtk20 atk pango pkgconfig libglade2 gnomehack
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
CPPFLAGS=-I${LOCALBASE}/include \
diff --git a/devel/xwpe/Makefile b/devel/xwpe/Makefile
index 7ea2f1a8eefe..b1a99d0fe7a2 100644
--- a/devel/xwpe/Makefile
+++ b/devel/xwpe/Makefile
@@ -32,7 +32,7 @@ MLINKS= xwpe.1 xwe.1 \
post-patch:
.for file in we_prog.c we_fl_unix.c
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \
- s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/${file}
+ s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/${file}
.endfor
${REINPLACE_CMD} -e 's|$$(INSTALL_PROGRAM)|${INSTALL_PROGRAM}|g' \
${WRKSRC}/Makefile.in
diff --git a/devel/xwpe/files/patch-09 b/devel/xwpe/files/patch-09
index 47bc8a4e0a37..2b956ba10032 100644
--- a/devel/xwpe/files/patch-09
+++ b/devel/xwpe/files/patch-09
@@ -18,9 +18,9 @@
- manpath = strdup("/usr/man:/usr/share/man:/usr/X11R6/man:/usr/local/man");
+ manpath = strdup(
+#if (defined(BSD) && (BSD >= 199306)) || (defined(sun) && defined(__svr4__))
-+ "/usr/share/man:%%X11BASE%%/man:%%LOCALBASE%%/man");
++ "/usr/share/man:%%LOCALBASE%%/man:%%LOCALBASE%%/man");
+#else
-+ "/usr/man:%%X11BASE%%/man:%%LOCALBASE%%/man");
++ "/usr/man:%%LOCALBASE%%/man:%%LOCALBASE%%/man");
+#endif
}
/* Allocate the maximum possible rather than continually realloc. */