13 files changed, 23 insertions, 28 deletions

diff --git a/comms/asmodem/Makefile b/comms/asmodem/Makefile
index 8c4432de4e0f..7c87c0dceb9f 100644
--- a/comms/asmodem/Makefile
+++ b/comms/asmodem/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Displays the modem status, designed to match AfterStep
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 MAN1=		asmodem.1
 PLIST_FILES=	bin/asmodem
diff --git a/comms/echolinux/Makefile b/comms/echolinux/Makefile
index 670b055785bf..022e853a777d 100644
--- a/comms/echolinux/Makefile
+++ b/comms/echolinux/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
 		gsm.1:${PORTSDIR}/audio/gsm
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|gcc|$${CC}|' -e 's|/usr/include/X11|$${X11BASE}/include|' \
-		-e 's|-o echogui -L/usr/X11R6/lib -lX11 -lXpm -lforms -lm -lpthread|$${CFLAGS} -o echogui -L$${X11BASE}/lib -lX11 -lXpm -lforms -lm ${PTHREAD_LIBS}|' \
+	@${REINPLACE_CMD} -e 's|gcc|$${CC}|' -e 's|/usr/include/X11|$${LOCALBASE}/include|' \
+		-e 's|-o echogui -L/usr/X11R6/lib -lX11 -lXpm -lforms -lm -lpthread|$${CFLAGS} -o echogui -L$${LOCALBASE}/lib -lX11 -lXpm -lforms -lm ${PTHREAD_LIBS}|' \
 		-e 's|CARGS|CFLAGS|' -e 's|= -DNodeFont=FL_TINY_SIZE|+= ${PTHREAD_CFLAGS} -DNodeFont=FL_TINY_SIZE|' \
 		-e 's|/usr/local/bin/|$${PREFIX}/bin/|' \
 		${WRKSRC}/echogui/Makefile
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 4c2ab979d7ce..f8138c87edc4 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -111,7 +111,7 @@ USE_GNOME+=	glib20
 CONFIGURE_ARGS+=	--without-x
 PLIST_SUB+=	X11='@comment '
 .else
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GNOME+=	gtk20 gnomelibs
 PLIST_SUB+=	X11=''
 MAN1+=	xgnokii.1
diff --git a/comms/hamfax/Makefile b/comms/hamfax/Makefile
index c63d01ac9a4b..e9055c3710d9 100644
--- a/comms/hamfax/Makefile
+++ b/comms/hamfax/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	hamfax
 PORTVERSION=	0.6.4
 PORTREVISION=	2
 CATEGORIES=	comms audio hamradio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	hamfax
+MASTER_SITES=	SF
 DISTNAME=	HamFax-${PORTVERSION}
 
 MAINTAINER=	carl@stagecraft.cx
@@ -19,7 +18,7 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 
 USE_QT_VER=	3
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-Qt-dir=${X11BASE} CXX="${CXX} ${PTHREAD_CFLAGS}" \
+CONFIGURE_ARGS=	--with-Qt-dir=${LOCALBASE} CXX="${CXX} ${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}" CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile
index 5379e14d63a5..709b7bb624e0 100644
--- a/comms/linpsk/Makefile
+++ b/comms/linpsk/Makefile
@@ -9,15 +9,14 @@ PORTNAME=	linpsk
 PORTVERSION=	0.8.1
 PORTREVISION=	4
 CATEGORIES=	comms hamradio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	A qt psk31 client
 
 LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
 		portaudio:${PORTSDIR}/audio/portaudio
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/bitstream-vera/fonts.dir:${PORTSDIR}/x11-fonts/bitstream-vera
+RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/bitstream-vera/fonts.dir:${PORTSDIR}/x11-fonts/bitstream-vera
 
 USE_PERL5_BUILD=yes
 USE_QT_VER=	3
@@ -27,14 +26,14 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--with-qtdir=${X11BASE} --prefix=${PREFIX}
+CONFIGURE_ARGS=	--with-qtdir=${LOCALBASE} --prefix=${PREFIX}
 
 SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread||' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-I$$(top_srcdir)/src/portaudio||' \
 		${WRKSRC}/src/Makefile.in \
 		${WRKSRC}/src/interfaces/Makefile.in
diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index 382b96b65cc0..27eb29770eb5 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -43,7 +43,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}/|' \
 		${WRKSRC}/help.c
 .for f in ${X11_PATCHFILES}
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/${f}
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/${f}
 .endfor
 
 do-install:
diff --git a/comms/linrad/files/patch-Makefile.in b/comms/linrad/files/patch-Makefile.in
index 783b4bb645e4..a5813ab6c9f8 100644
--- a/comms/linrad/files/patch-Makefile.in
+++ b/comms/linrad/files/patch-Makefile.in
@@ -17,7 +17,7 @@
 -@MEM@ -Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \
 --Wparentheses -Wstrict-prototypes -Werror -ffast-math \
 --fomit-frame-pointer -c -o
-+CFL	= ${CFLAGS} -DOSNUM=1 -I${X11BASE}/include -c -o
++CFL	= ${CFLAGS} -DOSNUM=1 -I${LOCALBASE}/include -c -o
  CFW	= -g -O -DOSNUM=2 -W -Wimplicit -Wreturn-type -Wformat \
  -Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \
  -Wparentheses -Wstrict-prototypes -Werror -ffast-math \
@@ -35,7 +35,7 @@
  
  
 -	gcc @MEM@ -oxlinrad -L/usr/X11R6/lib -lX11 -lpthread -lm \
-+	$(LCC) @MEM@ -oxlinrad -L${X11BASE}/lib -lX11 -pthread -lm \
++	$(LCC) @MEM@ -oxlinrad -L${LOCALBASE}/lib -lX11 -pthread -lm \
  -Wl,-Map,linrad.xmap,-warn-common \
  xmain.ol xvar.ol ui.ol lsetad.ol fft1.ol buf.ol lvar.ol \
  mouse.ol wide_graph.ol getiq.ol fft0.ol adtest.ol hires_graph.ol \
diff --git a/comms/rxtx/Makefile b/comms/rxtx/Makefile
index 868d311af894..026f9f28888c 100644
--- a/comms/rxtx/Makefile
+++ b/comms/rxtx/Makefile
@@ -23,7 +23,7 @@ JAVA_VERSION=	1.2+
 JAVA_OS=	native
 GNU_CONFIGURE=	yes
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
 PREFIX=		${JAVA_HOME}/jre
 NO_MTREE=	yes
diff --git a/comms/tkhylafax/files/patch-aa b/comms/tkhylafax/files/patch-aa
index e391030da8ea..86ff08289658 100644
--- a/comms/tkhylafax/files/patch-aa
+++ b/comms/tkhylafax/files/patch-aa
@@ -22,7 +22,7 @@
  
  # The full path to your postscript viewer
 -GHOSTVIEW = /usr/X11/bin/gv
-+GHOSTVIEW = ${X11BASE}/bin/gv
++GHOSTVIEW = ${LOCALBASE}/bin/gv
  
  ### DON'T EDIT ANYTHING BELOW THIS LINE ###
  
diff --git a/comms/twpsk/Makefile b/comms/twpsk/Makefile
index e3e3aa85dc6e..1f7d30321e24 100644
--- a/comms/twpsk/Makefile
+++ b/comms/twpsk/Makefile
@@ -32,7 +32,7 @@ FILES_TO_PATCH=	Makefile psk31.1 twpskHelp user-twpsk/makefile \
 post-patch:
 .for file in ${FILES_TO_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}/${file}
 .endfor
 
diff --git a/comms/xcept/Makefile b/comms/xcept/Makefile
index cda1dc4bc1c9..9e045f2781a5 100644
--- a/comms/xcept/Makefile
+++ b/comms/xcept/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcept
 PORTVERSION=	2.1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	joerg
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	joerg
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	A decoder for the CEPT (Btx) protocol
 
-USE_XLIB=	yes
+USE_XORG=	x11
 MAN1=		xcept.1
 MAN8=		ceptd.8
 MANCOMPRESSED=	maybe
diff --git a/comms/xcept/files/patch-ae b/comms/xcept/files/patch-ae
index d5e99520061a..4f04e87faceb 100644
--- a/comms/xcept/files/patch-ae
+++ b/comms/xcept/files/patch-ae
@@ -13,8 +13,8 @@
 -XINC	= -I/usr/X386/include
 -XLIB	= -L/usr/X386/lib
 +#CC	= gcc
-+XINC	= -I${X11BASE}/include
-+XLIB	= -L${X11BASE}/lib
++XINC	= -I${LOCALBASE}/include
++XLIB	= -L${LOCALBASE}/lib
  #WARN	= -W -Wunused -Wswitch -Wcomment -Wshadow -Wpointer-arith -Wcast-qual
  
  
diff --git a/comms/yawmppp/Makefile b/comms/yawmppp/Makefile
index ac8c080cc956..4e35b83c86a1 100644
--- a/comms/yawmppp/Makefile
+++ b/comms/yawmppp/Makefile
@@ -7,21 +7,18 @@
 
 PORTNAME=	yawmppp
 PORTVERSION=	2.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms windowmaker
 MASTER_SITES=	ftp://ftp.seul.org/pub/yawmppp/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Window Maker dockapp that helps with easy use of pppd
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
-USE_XPM=	yes
-CONFIGURE_ENV=	GTKCONFIG="${GTK_CONFIG}" CFLAGS="${CFLAGS} -I${X11BASE}/include"
-CONFIGURE_ARGS=	--x-includes="${X11BASE}/include" \
-		--x-libraries="${X11BASE}/lib"
+USE_XORG=	xpm x11
+CONFIGURE_ENV=	GTKCONFIG="${GTK_CONFIG}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 
 MAN1=		yawmppp.1x