diff options
| author | miwi <miwi@FreeBSD.org> | 2008-04-20 01:56:05 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-04-20 01:56:05 +0800 |
| commit | bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch) | |
| tree | f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /net | |
| parent | 2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff) | |
| download | freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.zst freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip | |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Diffstat (limited to 'net')
74 files changed, 120 insertions, 132 deletions
diff --git a/net/atmsupport/Makefile b/net/atmsupport/Makefile index ce56002d170d..9c0af4203753 100644 --- a/net/atmsupport/Makefile +++ b/net/atmsupport/Makefile @@ -21,7 +21,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tcldir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= unidecode.1 uniencode.1 diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile index 774dd5987b2e..41f78f28e132 100644 --- a/net/boinc-client/Makefile +++ b/net/boinc-client/Makefile @@ -7,6 +7,7 @@ PORTNAME= boinc-client PORTVERSION= 5.10.32 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pav @@ -43,10 +44,10 @@ OPTIONS= X11 "Build Boinc Manager GUI" on \ .include <bsd.port.pre.mk> .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 USE_WX= 2.6+ WX_CONF_ARGS= absolute -CPPFLAGS+= -I${X11BASE}/include +CPPFLAGS+= -I${LOCALBASE}/include USE_ICONV= yes LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \ diff --git a/net/clusterit/Makefile b/net/clusterit/Makefile index 24abed7e86f9..009351dce5a1 100644 --- a/net/clusterit/Makefile +++ b/net/clusterit/Makefile @@ -29,7 +29,7 @@ USE_PERL5_BUILD=yes post-patch: @${FIND} ${WRKSRC} -name Makefile | ${XARGS} \ - ${PERL} -pi -e 's#/usr/X11R6#${X11BASE}#g' + ${PERL} -pi -e 's#/usr/X11R6#${LOCALBASE}#g' .for file in command.c rvt.c screen.c @${PERL} -pi -e "s/malloc.h/stdlib.h/g" ${WRKSRC}/rvt/${file} .endfor diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile index e4d3ede2b212..f28452013217 100644 --- a/net/cvsup/Makefile +++ b/net/cvsup/Makefile @@ -7,7 +7,7 @@ PORTNAME= cvsup PORTVERSION= 16.1h -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net devel MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG} MASTER_SITE_SUBDIR=development/CVSup/snapshots @@ -55,7 +55,7 @@ CONFLICTS= cvsup-[0-9]* NO_LATEST_LINK= yes .endif .else -USE_XLIB= yes +USE_XORG= x11 COMMENT+= (GUI version) BUILD_DEPENDS= ${PREFIX}/lib/m3/pkg/formsvbt/${TARGET}/libm3formsvbt.a:${PORTSDIR}/lang/ezm3 CONFLICTS= cvsup-without-gui-[0-9]* diff --git a/net/dante/Makefile b/net/dante/Makefile index cfe10d07a0b6..7823d5040152 100644 --- a/net/dante/Makefile +++ b/net/dante/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --with-socks-conf=${PREFIX}/etc/socks.conf \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_RC_SUBR= sockd.sh diff --git a/net/freenx/Makefile b/net/freenx/Makefile index e0fb6a7a73fa..fa4f75c33447 100644 --- a/net/freenx/Makefile +++ b/net/freenx/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${NXPREFIX}/bin/nxagent:${PORTSDIR}/net/nxserver \ bash:${PORTSDIR}/shells/bash \ expect:${PORTSDIR}/lang/expect \ gls:${PORTSDIR}/sysutils/coreutils \ - xauth:${X_CLIENTS_PORT} + xauth:${PORTSDIR}/x11/xauth USE_PERL5_RUN= yes BUILD_WRKSRC= ${WRKSRC}/nxserver-helper diff --git a/net/gkrellm_snmp/Makefile b/net/gkrellm_snmp/Makefile index 240b3ded0531..b8d150e98e08 100644 --- a/net/gkrellm_snmp/Makefile +++ b/net/gkrellm_snmp/Makefile @@ -15,12 +15,12 @@ MAINTAINER= eike.bernhardt@gmx.de COMMENT= A gkrellm SNMP Monitor LIB_DEPENDS= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4 -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm PLIST_FILES= libexec/gkrellm/plugins/gkrellm_snmp.so USE_GNOME= imlib -MAKE_ENV= GKRELLM_INCLUDE="-I${X11BASE}/include/gkrellm/" \ - PLUGIN_DIR="${X11BASE}/libexec/gkrellm/plugins/" +MAKE_ENV= GKRELLM_INCLUDE="-I${LOCALBASE}/include/gkrellm/" \ + PLUGIN_DIR="${LOCALBASE}/libexec/gkrellm/plugins/" .include <bsd.port.mk> diff --git a/net/gkrellmmultiping2/Makefile b/net/gkrellmmultiping2/Makefile index 6f2afa4ab54d..79711b6347fe 100644 --- a/net/gkrellmmultiping2/Makefile +++ b/net/gkrellmmultiping2/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@fsck.ch COMMENT= GKrellM2 multiping plugin -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_GMAKE= yes diff --git a/net/gkrellmqst/Makefile b/net/gkrellmqst/Makefile index c6318c103fdf..80ad5a2260f7 100644 --- a/net/gkrellmqst/Makefile +++ b/net/gkrellmqst/Makefile @@ -17,7 +17,7 @@ DISTNAME= gkrellm_qst-${PORTVERSION} MAINTAINER= lme@FreeBSD.org COMMENT= Plugin for Gkrellm that displays updated info on several game servers -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm \ qstat:${PORTSDIR}/games/qstat diff --git a/net/gkrellmwireless/Makefile b/net/gkrellmwireless/Makefile index 038a23702b27..61dba19400ab 100644 --- a/net/gkrellmwireless/Makefile +++ b/net/gkrellmwireless/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://gkrellm.luon.net/files/ MAINTAINER= ports@FreeBSD.org COMMENT= GKrellM wireless plugin -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm NO_LATEST_LINK= yes diff --git a/net/gkrellmwireless2/Makefile b/net/gkrellmwireless2/Makefile index c981d514ed71..671e3c950835 100644 --- a/net/gkrellmwireless2/Makefile +++ b/net/gkrellmwireless2/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://gkrellm.luon.net/files/ MAINTAINER= ktsin@acm.org COMMENT= GKrellM wireless plugin -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 WRKSRC= ${WRKDIR}/gkrellmwireless diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile index e9819bf3807c..b0fb182c23d9 100644 --- a/net/gnome-netstatus/Makefile +++ b/net/gnome-netstatus/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-netstatus PORTVERSION= 2.12.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,7 +17,6 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A GNOME applet that shows network status -USE_XLIB= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_BZIP2= yes diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile index 0ef48da71823..ac3eedc5f8bb 100644 --- a/net/gspoof/Makefile +++ b/net/gspoof/Makefile @@ -31,7 +31,7 @@ post-patch: ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-Wall -O2|@CFLAGS@|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local/share|${PREFIX}/share|g ; \ - s|/usr/share|${X11BASE}/share|g' ${WRKSRC}/gtk.c + s|/usr/share|${LOCALBASE}/share|g' ${WRKSRC}/gtk.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gspoof ${PREFIX}/bin diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile index d68f2854276d..d99d2253a0eb 100644 --- a/net/gtk-vnc/Makefile +++ b/net/gtk-vnc/Makefile @@ -7,16 +7,15 @@ PORTNAME= gtk-vnc PORTVERSION= 0.3.5 +PORTREVISION= 1 CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtk-vnc +MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= VNC viewer widget for GTK+ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls -USE_XLIB= yes USE_GNOME= pygtk2 gnomehack USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/net/hawknl-devel/Makefile b/net/hawknl-devel/Makefile index a7b63c42ee79..beb26187bb3e 100644 --- a/net/hawknl-devel/Makefile +++ b/net/hawknl-devel/Makefile @@ -22,10 +22,10 @@ USE_ZIP= yes USE_DOS2UNIX= yes USE_GMAKE= yes MAKEFILE= makefile.linux -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes -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 MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${OPTFLAGS}" \ LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" @@ -35,7 +35,7 @@ OPTIONS= OPTIMIZATION "Enable optimization" off .include <bsd.port.pre.mk> -.if ${ARCH} == amd64 || ${ARCH} == ia64 +.if ${ARCH} == amd64 || ${ARCH} == ia64 BROKEN= does not compile on ${ARCH} .endif diff --git a/net/hawknl/Makefile b/net/hawknl/Makefile index dd94069bddd2..c61376e3cfbe 100644 --- a/net/hawknl/Makefile +++ b/net/hawknl/Makefile @@ -18,10 +18,10 @@ COMMENT= Portable networking library USE_DOS2UNIX= yes USE_GMAKE= yes MAKEFILE= makefile.linux -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes -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 MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${OPTFLAGS}" \ LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" diff --git a/net/howl/Makefile b/net/howl/Makefile index 86d934d8fd72..03cdefb968cb 100644 --- a/net/howl/Makefile +++ b/net/howl/Makefile @@ -21,7 +21,7 @@ USE_RC_SUBR= yes CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN8= mDNSResponder.8 PLIST_SUB= VERSION="${PORTVERSION}" diff --git a/net/ilbc/Makefile b/net/ilbc/Makefile index 0ca503ed0c21..66b044d0eaae 100644 --- a/net/ilbc/Makefile +++ b/net/ilbc/Makefile @@ -15,6 +15,6 @@ COMMENT= Internet Low Bit Rate codec (RFC3951) USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/net/imm/files/Makefile.freebsd b/net/imm/files/Makefile.freebsd index 948ca8f54099..379dae4d11a3 100644 --- a/net/imm/files/Makefile.freebsd +++ b/net/imm/files/Makefile.freebsd @@ -1,11 +1,11 @@ # Some versions of make, like SGI's, use the following variable to # determine which shell to use for executing commands: SHELL = /bin/sh -INCLUDE_DIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${X11BASE}/include +INCLUDE_DIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include # Libraries to use when linking: LIBS = -lm -TKLIBS= -L${X11BASE}/lib -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk84 -ltcl84 -lX11 +TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk84 -ltcl84 -lX11 TARGET = ../freebsd diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile index 8d0db3aec5dd..0a1a459e9834 100644 --- a/net/libgnetwork/Makefile +++ b/net/libgnetwork/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgnetwork PORTVERSION= 0.0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.0 @@ -19,7 +19,6 @@ COMMENT= A GLib-based networking wrapper USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GETTEXT= yes -USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack gconf2 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile index 9c3b59b186f7..ac8baa8087a2 100644 --- a/net/libnss-mysql/Makefile +++ b/net/libnss-mysql/Makefile @@ -18,7 +18,7 @@ COMMENT= NSS module using a MySQL database for backend USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-mysql=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_MYSQL= yes diff --git a/net/librsync/Makefile b/net/librsync/Makefile index 45db6b3de5a6..df080194947c 100644 --- a/net/librsync/Makefile +++ b/net/librsync/Makefile @@ -25,7 +25,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-shared --disable-trace -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN3= librsync.3 diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile index 476d5473eb8e..ae06dd83034c 100644 --- a/net/libsocket++/Makefile +++ b/net/libsocket++/Makefile @@ -17,7 +17,7 @@ MAINTAINER= arved@FreeBSD.org COMMENT= A C++ wrapper library to the sockets GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_AUTOTOOLS= automake:19 autoconf:261 libtool:15 SCRIPTS_ENV+= ACLOCAL_FLAGS="-I ${LOCALBASE}/share/aclocal/" diff --git a/net/mcl/Makefile b/net/mcl/Makefile index 259be8735047..d087695902d6 100644 --- a/net/mcl/Makefile +++ b/net/mcl/Makefile @@ -16,11 +16,11 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Implementation of the ALC and NORM Reliable Multicast Protocols -BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} \ +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ gdome-config:${PORTSDIR}/textproc/gdome2 \ glib-gettextize:${PORTSDIR}/devel/glib20 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GMAKE= yes MAN1= fcast.1 fcastn.1 mclrecv2.1 mclsend2.1 MAN2= mcl_abort.2 mcl_close.2 mcl_ctl.2 mcl_open.2 mcl_recv.2 \ diff --git a/net/mpich/Makefile b/net/mpich/Makefile index 4b451c55cb03..acfd75eef99e 100644 --- a/net/mpich/Makefile +++ b/net/mpich/Makefile @@ -7,7 +7,7 @@ PORTNAME= mpich DISTVERSION= 1.2.7p1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net parallel MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/mpi/ DIST_SUBDIR= mpich @@ -43,7 +43,7 @@ PLIST_SUB+= X11="@comment " .else BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot -USE_XLIB= yes +USE_XORG= x11 CONFIGURE_ARGS+=--enable-mpe_graphics PLIST_SUB+= X11="" .endif @@ -205,7 +205,7 @@ CONFIGURE_ENV+= RSHCOMMAND="${LOCALBASE}/bin/ssh" pre-configure: .for fic in mpe/configure mpe/src/Makefile.in - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/${fic} + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/${fic} .endfor .for fic in examples/basic/Makefile.in installtest/Makefile.in ${REINPLACE_CMD} -e 's|@F90_SUFFIX@|f90|' ${WRKSRC}/${fic} diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 56ed415d9ef0..601375de6b19 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -32,7 +32,7 @@ USE_GNOME= gtk20 CONFIGURE_ARGS=--enable-gtk2 .endif USE_XORG= x11 -CONFIGURE_ARGS+=--with-gtk-prefix=${X11BASE} +CONFIGURE_ARGS+=--with-gtk-prefix=${LOCALBASE} .else PKGNAMESUFFIX= -nox11 CONFIGURE_ARGS=--without-gtk --with-gtk-prefix=/nonexistant diff --git a/net/mugshot/Makefile b/net/mugshot/Makefile index b5c58ca6c12a..35395f2e22f7 100644 --- a/net/mugshot/Makefile +++ b/net/mugshot/Makefile @@ -24,7 +24,7 @@ BUILD_DEPENDS= ${PKGCONFIG_LOCAL_BASE}/dbus-1.pc:${PORTSDIR}/devel/dbus:install ${LOCALBASE}/include/firefox/caps/nsIScriptSecurityManager.h:${PORTSDIR}/www/firefox:install \ ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre:install \ ${LOCALBASE}/lib/firefox/xpidl:${PORTSDIR}/www/firefox:install \ - ${X11BASE}/include/X11/extensions/scrnsaver.h:${PORTSDIR}/x11/xorg-libraries:install \ + ${LOCALBASE}/include/X11/extensions/scrnsaver.h:${PORTSDIR}/x11/xorg-libraries:install \ dbus>=1.0.2:${PORTSDIR}/devel/dbus:install USE_GNOME= gnomehack gconf2 glib20 gtk20 pango gnomevfs2 gnomedesktop @@ -38,7 +38,7 @@ USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mugshot/firefox/components PKGCONFIG_LOCAL_BASE= ${LOCALBASE}/libdata/pkgconfig -PKGCONFIG_X11_BASE= ${X11BASE}/libdata/pkgconfig +PKGCONFIG_X11_BASE= ${LOCALBASE}/libdata/pkgconfig mugshot_INSTALL_cmd= install @@ -48,8 +48,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= "--with-gecko-idl=${FIREFOX_IDL_PATH}" \ "--with-gecko-headers=${LOCALBASE}/include/firefox" \ "--with-xpidl=${LOCALBASE}/lib/firefox/xpidl" \ - "--x-includes=${X11BASE}/include" \ - "--x-libraries=${X11BASE}/lib" + "--x-includes=${LOCALBASE}/include" \ + "--x-libraries=${LOCALBASE}/lib" FIREFOX_IDL_PATH!=${SH} -c 'for i in ${LOCALBASE}/share/idl/firefox-*; do [ -f $$i/nsIURI.idl ] && ${ECHO} $$i && break; done; exit 0;' BUILD_DEPENDS+=${FIREFOX_IDL_PATH}/nsIURI.idl:${PORTSDIR}/www/firefox:install diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile index 6f0fa2e15432..42c612f5552d 100644 --- a/net/netspeed_applet/Makefile +++ b/net/netspeed_applet/Makefile @@ -7,6 +7,7 @@ PORTNAME= netspeed_applet PORTVERSION= 0.14 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/ @@ -15,7 +16,6 @@ COMMENT= Applet that shows how much network traffic occurs on an interface LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop -USE_X_PREFIX= yes INSTALLS_OMF= yes USE_GMAKE= yes USE_GNOME= gnomehier intlhack gnomeprefix gnomehack gnomepanel diff --git a/net/nxserver/Makefile b/net/nxserver/Makefile index e14a71dee4a1..bcc9e9d95a55 100644 --- a/net/nxserver/Makefile +++ b/net/nxserver/Makefile @@ -32,7 +32,6 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \ ONLY_FOR_ARCHS= i386 USE_GMAKE= yes -USE_GETOPT_LONG= yes USE_GETTEXT= yes WRKSRC= ${WRKDIR} GNU_CONFIGURE= yes diff --git a/net/openh323/Makefile b/net/openh323/Makefile index f37b801a4d9a..ab00c7036da4 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -23,7 +23,7 @@ USE_BISON= build USE_GMAKE= yes USE_AUTOTOOLS= autoconf:261 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ALL_TARGET= optshared CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \ diff --git a/net/openslp/Makefile b/net/openslp/Makefile index 9c3db1eda1cf..52936984b35c 100644 --- a/net/openslp/Makefile +++ b/net/openslp/Makefile @@ -18,7 +18,7 @@ COMMENT= Open-source implementation of the Service Location Protocol USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes USE_OPENSSL= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/openslp \ --localstatedir=/var CONFIGURE_TARGET=--target=${MACHINE_ARCH}-unknown-freebsd${OSREL} diff --git a/net/penguintv/pkg-plist b/net/penguintv/pkg-plist index ed137d6237ce..bf5b177a7fd3 100644 --- a/net/penguintv/pkg-plist +++ b/net/penguintv/pkg-plist @@ -173,6 +173,5 @@ share/locale/sv/LC_MESSAGES/penguintv.mo @dirrm %%PYTHON_SITELIBDIR%%/penguintv/ajax @dirrm %%PYTHON_SITELIBDIR%%/penguintv -@comment @cwd %%X11BASE%% @comment etc/gconf/gconf.xml.defaults/schemas/apps/penguintv/%gconf.xml @comment etc/gconf/gconf.xml.defaults/apps/penguintv/%gconf.xml diff --git a/net/pvm/Makefile b/net/pvm/Makefile index eea2724a20b7..220eaa221ac4 100644 --- a/net/pvm/Makefile +++ b/net/pvm/Makefile @@ -7,7 +7,7 @@ PORTNAME= pvm PORTVERSION= 3.4.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net parallel MASTER_SITES= http://www.netlib.org/pvm3/ \ ftp://ftp.chg.ru/pub/prog/parallel/pvm3/ @@ -22,7 +22,7 @@ PKGNAMESUFFIX= -nox11 MAKE_ENV+= WITHOUT_X11=yes PLIST_SUB+= X11='@comment ' .else -USE_XLIB= yes +USE_XORG= x11 xaw xt PLIST_SUB+= X11='' .endif diff --git a/net/pvm/files/patch-ab b/net/pvm/files/patch-ab index 1f4ca2992ffc..e27dfb5086e5 100644 --- a/net/pvm/files/patch-ab +++ b/net/pvm/files/patch-ab @@ -6,8 +6,8 @@ XLIBS = -lXaw -lXmu -lXext -lXt -lX11 -XCFLAGS = -I/usr/local/X11R5/include -I/usr/local/X11/include \ - -L/usr/local/X11R5/lib -L/usr/local/X11/lib -+XCFLAGS = -I${X11BASE}/include \ -+ -L${X11BASE}/lib ++XCFLAGS = -I${LOCALBASE}/include \ ++ -L${LOCALBASE}/lib HEADERS = $(SDIR)/hostc.h $(SDIR)/imp.h $(SDIR)/myalloc.h \ $(PVMIDIR)/pvm3.h $(PVMDIR)/src/bfunc.h diff --git a/net/radiusclient/Makefile b/net/radiusclient/Makefile index b83c6bfe8825..b0746f42b4ea 100644 --- a/net/radiusclient/Makefile +++ b/net/radiusclient/Makefile @@ -18,6 +18,6 @@ COMMENT= Client library and basic utilities for RADIUS AAA USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/net/rqm/Makefile b/net/rqm/Makefile index a78d7fc6fab7..b54862fca515 100644 --- a/net/rqm/Makefile +++ b/net/rqm/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase WRKSRC= ${WRKDIR}/rqm/ HAS_CONFIGURE= yes -CONFIGURE_ENV= PREFIX=${PREFIX} X11BASE=${X11BASE} +CONFIGURE_ENV= PREFIX=${PREFIX} X11BASE=${LOCALBASE} ALL_TARGET= rqm diff --git a/net/rqm/files/patch-aa b/net/rqm/files/patch-aa index ba0b3c041db2..31697563d121 100644 --- a/net/rqm/files/patch-aa +++ b/net/rqm/files/patch-aa @@ -18,7 +18,7 @@ FreeBSD ) CC="gcc" WFLAGS=$GCCWFLAGS - INCLUDE="-I/usr/local/include" -+ INCLUDE="-I${PREFIX}/include -I${X11BASE}/include" ++ INCLUDE="-I${LOCALBASE}/include" LDLIBS="-lm" DEBUG="-g" CHAR="-fsigned-char" diff --git a/net/sdr/Makefile b/net/sdr/Makefile index f6bcc8ff9474..7854475d5001 100644 --- a/net/sdr/Makefile +++ b/net/sdr/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdr PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mbone tk MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/ @@ -21,7 +21,6 @@ PLIST_FILES= bin/sdr WRKSRC= ${WRKDIR}/sdr/freebsd HAS_CONFIGURE= yes USE_GMAKE= yes -USE_X_PREFIX= yes post-extract: @${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd diff --git a/net/sdr/files/Makefile.freebsd b/net/sdr/files/Makefile.freebsd index 303950175fa9..34a7a8c8a943 100644 --- a/net/sdr/files/Makefile.freebsd +++ b/net/sdr/files/Makefile.freebsd @@ -1,6 +1,6 @@ CC = gcc -g -O -fwritable-strings -INCLUDES = -I${X11BASE}/include -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/uclmmbase -LIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84 -luclmmbase -L${X11BASE}/lib -lX11 -lz -lm +INCLUDES = -I${LOCALBASE}/include -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/uclmmbase +LIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84 -luclmmbase -lX11 -lz -lm CFLAGS = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD all:: sdr diff --git a/net/service-discovery-applet/Makefile b/net/service-discovery-applet/Makefile index dc582b2aca3f..34423e23ed0e 100644 --- a/net/service-discovery-applet/Makefile +++ b/net/service-discovery-applet/Makefile @@ -8,7 +8,7 @@ PORTNAME= service-discovery-applet PORTVERSION= 0.4.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net dns gnome MASTER_SITES= http://0pointer.de/~sebest/ @@ -18,7 +18,6 @@ COMMENT= A GNOME applet that shows available network services using mDNS BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi RUN_DEPENDS= ${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi -USE_XLIB= yes USE_GETTEXT= yes USE_PYTHON= yes USE_GNOME= gnomehack gnomeprefix intlhack pygnomedesktop diff --git a/net/silky/Makefile b/net/silky/Makefile index 58535c4ae901..29ff496dae8f 100644 --- a/net/silky/Makefile +++ b/net/silky/Makefile @@ -9,7 +9,7 @@ PORTNAME= silky PORTVERSION= 0.5.4 PORTREVISION= 5 CATEGORIES= net security -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ ftp://rusunix.org/pub/FreeBSD/distfiles/ MASTER_SITE_SUBDIR= silky @@ -25,8 +25,8 @@ CONFIGURE_ARGS= --with-silc-include=${LOCALBASE}/include/silc \ --with-silc-libs=${LOCALBASE}/lib \ --with-docdir=${DOCSDIR} \ --with-libintl-prefix=${LOCALBASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" USE_GNOME= gtk20 libglade2 gnomelibs USE_GMAKE= yes @@ -35,7 +35,7 @@ USE_PERL5= yes post-patch: @${PERL} -pi -e 's/ include / /' ${WRKSRC}/Makefile.in @${PERL} -pi -e 's|share/pixmaps/\$${\w+}|share/pixmaps/|; \ - s|(PACKAGE_PIXMAPS_DIR \")\$${packageprefix}/|\1${X11BASE}/|' \ + s|(PACKAGE_PIXMAPS_DIR \")\$${packageprefix}/|\1${LOCALBASE}/|' \ ${WRKSRC}/${CONFIGURE_SCRIPT} .include <bsd.port.mk> diff --git a/net/skstream/Makefile b/net/skstream/Makefile index 9a0a721637b4..7530be01b330 100644 --- a/net/skstream/Makefile +++ b/net/skstream/Makefile @@ -18,7 +18,7 @@ USE_GMAKE= yes USE_GNOME= pkgconfig gnomehack USE_GCC= 3.4 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's| install-docdataDATA | |g' ${WRKSRC}/Makefile.in diff --git a/net/socketbind/Makefile b/net/socketbind/Makefile index ac1c99e045a0..0b60687d8fda 100644 --- a/net/socketbind/Makefile +++ b/net/socketbind/Makefile @@ -14,7 +14,7 @@ DISTFILES= # none MAINTAINER= nm@web.am COMMENT= Library to bind applications on multihomed machines to specific IP address -INSTALLS_SHLIB= YES +USE_LDCONFIG= YES NOMAN= YES INSTALL_TARGET= PLIST_SUB= "DOCSDIR=share/doc/${PORTNAME}" diff --git a/net/socks5/Makefile b/net/socks5/Makefile index 22e6076670fc..c80371a8de15 100644 --- a/net/socks5/Makefile +++ b/net/socks5/Makefile @@ -30,7 +30,7 @@ CONFLICTS= dante-[0-9]* # --with-passwd WRKSRC= ${WRKDIR}/${DISTNAME} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CFLAGS+= -DHAVE_VSNPRINTF CONFIGURE_ARGS= --with-libconffile=${PREFIX}/etc/libsocks5.conf \ diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile index 50e4b85ff887..e97b766a0695 100644 --- a/net/ssvnc/Makefile +++ b/net/ssvnc/Makefile @@ -7,25 +7,25 @@ PORTNAME= ssvnc PORTVERSION= 1.0.20 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net security MASTER_SITES= http://www.karlrunge.com/x11vnc/etv/ MAINTAINER= alepulver@FreeBSD.org COMMENT= Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer) -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= stunnel:${PORTSDIR}/security/stunnel -USE_XLIB= yes +USE_XORG= xi xmu xt xaw USE_TCL_RUN= 84 USE_TK_RUN= 84 WRKSRC= ${WRKDIR}/${PORTNAME} post-patch: @${REINPLACE_CMD} -e \ - 's|/usr/local|${LOCALBASE}|g; s|/usr/X11R6|${X11BASE}|g' \ + 's|/usr/local|${LOCALBASE}|g; s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/build.unix @${REINPLACE_CMD} -e \ 's|exec wish|exec ${WISH}|; \ diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile index aeea3caba592..8b7bfea26ca2 100644 --- a/net/tapidbus/Makefile +++ b/net/tapidbus/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GNOME= pkgconfig glib20 gnomehack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/net/tcpillust/Makefile b/net/tcpillust/Makefile index 210dfd4a7790..9b9c7fb7dc17 100644 --- a/net/tcpillust/Makefile +++ b/net/tcpillust/Makefile @@ -7,7 +7,7 @@ PORTNAME= tcpillust PORTVERSION= 1.0a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net tcl tk MASTER_SITES= ftp://ftp.csl.sony.co.jp/CSL/nishida/ @@ -16,7 +16,7 @@ COMMENT= A graphical TCP connection analysis tool USE_TCL= yes USE_TK= yes -USE_XLIB= yes +USE_XORG= xt USE_MOTIF= yes MAN1= tcpillust.1 @@ -32,7 +32,7 @@ PLIST_FILES= bin/tcpillust \ do-build: .for file in binread.c button.c draw.c parser.c tcpillust.c ${CC} ${CFLAGS} -I${LOCALBASE}/include/ -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} \ - -I${X11BASE}/include -DILTDIR=\"${DATADIR}\" -c ${WRKSRC}/${file} -o ${WRKSRC}/${file:S/.c/.o/} + -I${LOCALBASE}/include -DILTDIR=\"${DATADIR}\" -c ${WRKSRC}/${file} -o ${WRKSRC}/${file:S/.c/.o/} .endfor ${CC} ${CFLAGS} -L${TCL_LIBDIR} -L${TK_LIBDIR} -L${LOCALBASE}/lib \ -lm -lpcap -ltcl${TCL_VER:S/.//} -ltk${TK_VER:S/.//} ${WRKSRC}/*.o -o ${WRKSRC}/tcpillust diff --git a/net/tcpview/Makefile b/net/tcpview/Makefile index 5facb70d168f..0d339c6b2d33 100644 --- a/net/tcpview/Makefile +++ b/net/tcpview/Makefile @@ -26,6 +26,6 @@ post-patch: .endfor post-install: - ${INSTALL_DATA} ${WRKSRC}/DOC/Tcpview ${X11BASE}/lib/X11/app-defaults/ + ${INSTALL_DATA} ${WRKSRC}/DOC/Tcpview ${LOCALBASE}/lib/X11/app-defaults/ .include <bsd.port.mk> diff --git a/net/tcpview/files/patch-Makefile b/net/tcpview/files/patch-Makefile index d83a34d70748..403254edc6bc 100644 --- a/net/tcpview/files/patch-Makefile +++ b/net/tcpview/files/patch-Makefile @@ -10,7 +10,7 @@ -LIB = +DEFINES = -DCSLIP -DPPP +CCOPT = -O0 -+INCLUDES = -I.. -I$(X11BASE)/include ++INCLUDES = -I.. -I$(LOCALBASE)/include +LIB =-ll # These are for the Sun4 version @@ -68,7 +68,7 @@ tcpview: $(TCPVIEW_OBJ) - $(CC) $(CFLAGS) -o $@ $(TCPVIEW_OBJ) $(XLIB) $(LIB) -+ $(CC) $(CFLAGS) -o $@ $(TCPVIEW_OBJ) -L${X11BASE}/lib $(XLIB) $(LIB) ++ $(CC) $(CFLAGS) -o $@ $(TCPVIEW_OBJ) -L${LOCALBASE}/lib $(XLIB) $(LIB) tcpslice: $(TCPSLICE_OBJ) $(CC) $(CFLAGS) -o $@ $(TCPSLICE_OBJ) diff --git a/net/tcpview/pkg-plist b/net/tcpview/pkg-plist index 5d32a20d72bf..b7ecafba2833 100644 --- a/net/tcpview/pkg-plist +++ b/net/tcpview/pkg-plist @@ -6,5 +6,4 @@ lib/tcpview/hosts lib/tcpview/manuf @dirrm lib/tcpview/filters @dirrm lib/tcpview -@cwd %%X11BASE%% lib/X11/app-defaults/Tcpview diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index 06af4ec36957..bfd49cabccf6 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -28,7 +28,7 @@ WRKSRC= ${WRKDIR}/vnc_unixsrc USE_BZIP2= yes USE_PERL5= yes USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm ALL_TARGET= World NO_INSTALL_MANPAGES= yes @@ -51,7 +51,7 @@ PLIST_SUB+= JVNC_VIEWER="@comment " #.include <bsd.port.pre.mk> -.if exists(${X11BASE}/share/vnc/classes/index.vnc) +.if exists(${LOCALBASE}/share/vnc/classes/index.vnc) IGNORE= vnc has already been installed, please uninstall it first .endif diff --git a/net/tightvnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile b/net/tightvnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile index c1ecf008a8f1..26bd2d6f5e73 100644 --- a/net/tightvnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile +++ b/net/tightvnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile @@ -6,13 +6,13 @@ -#ifdef DefaultFontPath -DEFAULTFONTPATH = DefaultFontPath -+DEFAULTFONTPATH = ${X11BASE}/lib/X11/fonts/misc ++DEFAULTFONTPATH = ${LOCALBASE}/lib/X11/fonts/misc SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\" -#endif -#ifdef DefaultRGBDatabase -DEFAULTRGBDATABASE = DefaultRGBDatabase -+DEFAULTRGBDATABASE = ${X11BASE}/lib/X11/rgb ++DEFAULTRGBDATABASE = ${LOCALBASE}/lib/X11/rgb SITE_RGB_DB = -DRGB_DB=\"$(DEFAULTRGBDATABASE)\" -#endif diff --git a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile index 4a05fb4b3d4f..64fc790f184d 100644 --- a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile +++ b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile @@ -5,13 +5,13 @@ #ifdef DefaultFontPath -DEFAULTFONTPATH = DefaultFontPath -+DEFAULTFONTPATH = ${X11BASE}/lib/X11/fonts/misc ++DEFAULTFONTPATH = ${LOCALBASE}/lib/X11/fonts/misc SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\" #endif #ifdef DefaultRGBDatabase -DEFAULTRGBDATABASE = DefaultRGBDatabase -+DEFAULTRGBDATABASE = ${X11BASE}/lib/X11/rgb ++DEFAULTRGBDATABASE = ${LOCALBASE}/lib/X11/rgb SITE_RGB_DB = -DRGB_DB=\"$(DEFAULTRGBDATABASE)\" #endif diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile index 876b02967761..78729844081c 100644 --- a/net/tsclient/Makefile +++ b/net/tsclient/Makefile @@ -7,7 +7,7 @@ PORTNAME= tsclient PORTVERSION= 0.150 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net gnome MASTER_SITES= SF @@ -21,7 +21,6 @@ OPTIONS= GNOME "Build with gnome support" on \ XNEST "X via Xnest support (experimental)" off USE_AUTOTOOLS= libtool:15 automake:19 autoconf:261 -USE_X_PREFIX= yes USE_GNOME= gtk20 USE_GMAKE= yes USE_GETTEXT= yes diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile index 8c8d44f5449b..6829a9daa7ad 100644 --- a/net/tsocks/Makefile +++ b/net/tsocks/Makefile @@ -19,7 +19,7 @@ COMMENT= Allow non SOCKS aware applications to use SOCKS without modification GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC=${WRKDIR}/${PORTNAME}-${PORTVERSION:C/.b.*//} diff --git a/net/ttt/Makefile b/net/ttt/Makefile index d1b57c03327f..d40d349ab1d6 100644 --- a/net/ttt/Makefile +++ b/net/ttt/Makefile @@ -18,9 +18,7 @@ LIB_DEPENDS= BLT24.3:${PORTSDIR}/x11-toolkits/blt GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.4 \ - --with-tk=${LOCALBASE}/lib/tk8.4 \ - --x-libraries=${X11BASE}/lib \ - --x-includes=${X11BASE}/include + --with-tk=${LOCALBASE}/lib/tk8.4 INSTALL_TARGET= install install-man MAN1= ttt.1 tttprobe.1 tttview.1 diff --git a/net/vde/Makefile b/net/vde/Makefile index 386b6a441d67..4d739e250f30 100644 --- a/net/vde/Makefile +++ b/net/vde/Makefile @@ -18,7 +18,7 @@ COMMENT= User-mode virtual ethernet infrastructure CONFLICTS= vde2-[0-9]* USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index b125e31306d3..830415abee3d 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -8,6 +8,7 @@ PORTNAME= vinagre PORTVERSION= 0.5.1 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,7 +24,6 @@ LIB_DEPENDS= gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \ USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomeprefix intlhack gnomehack libglade2 gconf2 gnomedocutils USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/net/vino/Makefile b/net/vino/Makefile index e57b21dfc30c..63fcdafae09b 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -8,6 +8,7 @@ PORTNAME= vino PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -19,7 +20,6 @@ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 diff --git a/net/vnc/Makefile b/net/vnc/Makefile index 81343788eb54..f7525e1cac0f 100644 --- a/net/vnc/Makefile +++ b/net/vnc/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes # The vnc supplied zlib seg. faults if compiled with -O CONFIGURE_ARGS= --with-installed-zlib USE_XLIB= yes -USE_XPM= yes +USE_XORG= xpm xext WANT_PERL= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix @@ -45,8 +45,8 @@ DISTFILES+= X430src-1.tgz:x \ X430src-2.tgz:x \ X430src-3.tgz:x -RUN_DEPENDS+= xauth:${X_CLIENTS_PORT} \ - ${X11BASE}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${X_FONTS_MISC_PORT} +RUN_DEPENDS+= xauth:${PORTSDIR}/x11/xauth \ + ${LOCALBASE}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${X_FONTS_MISC_PORT} USE_PERL5= yes @@ -77,7 +77,7 @@ post-extract: post-patch: .if !defined(WITHOUT_SERVER) - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/xc/config/cf/vnc.def @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' -e 's|%%CXX%%|${CXX}|g' \ ${WRKSRC}/xc/config/cf/FreeBSD.cf @@ -94,7 +94,6 @@ pre-install: @${CP} ${PKGDIR}/pkg-plist ${PLIST} .if !defined(WITHOUT_SERVER) @if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \ - ${ECHO_CMD} @cwd ${X11BASE} ; \ ${ECHO_CMD} lib/modules/extensions/vnc.so ; \ ${ECHO_CMD} "@dirrmtry lib/modules/extensions" ; \ ${ECHO_CMD} "@dirrmtry lib/modules" ; \ @@ -114,10 +113,10 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xc/programs/Xserver/Xvnc ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin @if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \ - ${MKDIR} ${X11BASE}/lib/modules/extensions ; \ + ${MKDIR} ${LOCALBASE}/lib/modules/extensions ; \ ${INSTALL_PROGRAM} \ ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so \ - ${X11BASE}/lib/modules/extensions ; \ + ${LOCALBASE}/lib/modules/extensions ; \ fi ${INSTALL_MAN} ${WRKSRC}/xc/programs/Xserver/Xvnc.man \ ${PREFIX}/man/man1/Xvnc.1 diff --git a/net/vnc/files/vnc.def-patch b/net/vnc/files/vnc.def-patch index 7916363a71fd..b1c307538785 100644 --- a/net/vnc/files/vnc.def-patch +++ b/net/vnc/files/vnc.def-patch @@ -5,7 +5,7 @@ #endif +#ifdef FreeBSDArchitecture -+#define ProjectRoot %%X11BASE%% ++#define ProjectRoot %%LOCALBASE%% +#endif + #define HasFreetype2 NO diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 97efdcaecefa..e18c8dc90940 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -7,7 +7,7 @@ PORTNAME?= wireshark PORTVERSION= 1.0.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://wireshark.osmirror.nl/download/src/ \ @@ -26,7 +26,6 @@ USE_PERL5_BUILD=yes USE_PYTHON_BUILD=yes USE_ICONV= yes USE_BZIP2= yes -USE_GCC= 3.4+ USE_GMAKE= yes USE_GNOME= gnometarget WANT_GNOME= yes @@ -62,7 +61,7 @@ PLIST_SUB+= ${x:U}=bin/$x .endfor .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 .endif .if !defined(LITE) diff --git a/net/wmnet/files/patch-aa b/net/wmnet/files/patch-aa index c1e40dc49110..2288aca11852 100644 --- a/net/wmnet/files/patch-aa +++ b/net/wmnet/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Fri Dec 4 02:03:58 1998 -+++ Makefile Mon Apr 12 00:05:16 1999 +--- Makefile.orig 1998-12-03 16:33:58.000000000 +0100 ++++ Makefile 2008-04-11 14:58:15.000000000 +0200 @@ -2,22 +2,24 @@ # Makefile,v 1.8 1998/12/03 15:33:58 rneswold Exp # @@ -9,14 +9,15 @@ BINDIR=${PREFIX}/bin -LIBDIR = -L/usr/X11R6/lib -L/usr/local/lib -+LIBDIR = -L${X11BASE}/lib -L${LOCALBASE}/lib ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 -lkvm OBJS = main.o if.o wmgeneral.o - INCDIR = -I${X11BASE}/include - +-INCDIR = -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include ++ +CC ?= cc +CFLAGS ?= -O -+ + .c.o : - cc -c -g -O1 -Wall ${INCDIR} $< -o $*.o + $(CC) -c $(CFLAGS) -g -Wall ${INCDIR} $< -o $*.o diff --git a/net/wmpiki/Makefile b/net/wmpiki/Makefile index 2f5524f2555a..4ba3ca20a480 100644 --- a/net/wmpiki/Makefile +++ b/net/wmpiki/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_XORG= xpm post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|$$(X11BASE)|g' \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|$$(LOCALBASE)|g' \ -e 's|/include/X11|/include|g' \ -e 's|gcc|cc|g' \ ${WRKSRC}/Makefile diff --git a/net/wmq3/Makefile b/net/wmq3/Makefile index e1ba196c2458..34cbd8f57f6b 100644 --- a/net/wmq3/Makefile +++ b/net/wmq3/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmq3 PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net windowmaker games MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \ http://mirror2.unixfreunde.de/ @@ -19,8 +19,7 @@ RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat WRKSRC= ${WRKDIR}/${PORTNAME}/${PORTNAME} USE_GMAKE= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= pkg-message diff --git a/net/wmq3/files/patch-Makefile b/net/wmq3/files/patch-Makefile index 35fb478986d0..d0f727af8e79 100644 --- a/net/wmq3/files/patch-Makefile +++ b/net/wmq3/files/patch-Makefile @@ -4,9 +4,9 @@ -LIBDIR = -L/usr/X11R6/lib -MANDIR = /usr/local/man/man1/ -INSTALL = install -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 -+CFLAGS += -I${X11BASE}/include ++CFLAGS += -I${LOCALBASE}/include OBJS = wmq3.o \ ../wmgeneral/wmgeneral.o \ ../wmgeneral/misc.o \ diff --git a/net/wmwifi/Makefile b/net/wmwifi/Makefile index 9af84fba9e02..22cf1c4ab1d2 100644 --- a/net/wmwifi/Makefile +++ b/net/wmwifi/Makefile @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_XORG= x11 xpm USE_GMAKE= yes -CONFIGURE_ENV+= "CPPFLAGS=-I${X11BASE}/include" +CONFIGURE_ENV+= "CPPFLAGS=-I${LOCALBASE}/include" PLIST_FILES= bin/wmwifi diff --git a/net/wmwlmon/Makefile b/net/wmwlmon/Makefile index 8f666055e60c..204441684a2e 100644 --- a/net/wmwlmon/Makefile +++ b/net/wmwlmon/Makefile @@ -31,7 +31,7 @@ BROKEN= Does not compile with GCC 4.2 post-patch: ${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.presed - ${SED} -e 's#/usr/X11R6#${X11BASE}#g' \ + ${SED} -e 's#/usr/X11R6#${LOCALBASE}#g' \ -e 's#/usr/local#${LOCALBASE}#g' \ ${WRKSRC}/Makefile.presed > ${WRKSRC}/Makefile diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile index 91f250a4a34f..403598a7f017 100644 --- a/net/xipdump/Makefile +++ b/net/xipdump/Makefile @@ -7,7 +7,7 @@ PORTNAME= xipdump PORTVERSION= 1.5.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= http://www.lse.epita.fr/twiki/pub/Projects/XipDump/ EXTRACT_SUFX= .tgz @@ -17,7 +17,7 @@ COMMENT= Displays ip packets using X window BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10 -USE_X_PREFIX= yes +USE_XORG= xt x11 ice xaw xmu GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="`${LIBNET_CONFIG} --libs`" CFLAGS+= `${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines` \ diff --git a/net/xisp/files/patch-Makefile b/net/xisp/files/patch-Makefile index 62e2fa543fde..66e8289ded6e 100644 --- a/net/xisp/files/patch-Makefile +++ b/net/xisp/files/patch-Makefile @@ -9,7 +9,7 @@ -X11PREFIX = /usr/X11R6 +CC ?= gcc +PREFIX = %%PREFIX%% -+X11PREFIX = ${X11BASE} ++X11PREFIX = ${LOCALBASE} INCX11 = $(X11PREFIX)/include LIBX11 = $(X11PREFIX)/lib -INCFORMS = $(X11PREFIX)/include diff --git a/net/xpvm/files/patch-src:Makefile.aimk b/net/xpvm/files/patch-src:Makefile.aimk index 0e93e832ab76..6d7886d89fe5 100644 --- a/net/xpvm/files/patch-src:Makefile.aimk +++ b/net/xpvm/files/patch-src:Makefile.aimk @@ -67,8 +67,8 @@ diff -ruN xpvm.orig/src/Makefile.aimk xpvm/src/Makefile.aimk # Linux Like Systems -#XINCL = -I/usr/X11R6/include -#XLIBDIR = -L/usr/X11R6/lib -+XINCL = -I$(X11BASE)/include -+XLIBDIR = -L$(X11BASE)/lib ++XINCL = -I$(LOCALBASE)/include ++XLIBDIR = -L$(LOCALBASE)/lib XLIB = -lX11 #XLIB = -lX11 -lXpm diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index 558300076b7b..d5546c5cede6 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -24,7 +24,7 @@ USE_GNOME= gdkpixbuf USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-GL-prefix=${X11BASE}/lib \ +CONFIGURE_ARGS= --with-GL-prefix=${LOCALBASE}/lib \ --with-lib-GL \ --with-host=${LOCALBASE}/bin/host CONFIGURE_ENV+= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ diff --git a/net/yaz++/Makefile b/net/yaz++/Makefile index b180de385149..0795c55d2110 100644 --- a/net/yaz++/Makefile +++ b/net/yaz++/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= yaz.3:${PORTSDIR}/net/yaz GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-shared --with-yaz=${LOCALBASE}/bin -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN8= yazpp-config.8 diff --git a/net/yazproxy/Makefile b/net/yazproxy/Makefile index bd9c5cf17ecb..ba6069d32911 100644 --- a/net/yazproxy/Makefile +++ b/net/yazproxy/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= yazpp:${PORTSDIR}/net/yaz++ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-shared --with-yazpp=${LOCALBASE}/bin -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN8= yazproxy.8 |