- 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)

1 files changed, 5 insertions, 5 deletions

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 66e649b2f98b..408499131f5f 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	icon
 PORTVERSION=	9.4.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.arizona.edu/icon/ftp/packages/unix/
 DISTNAME=	${PORTNAME}.v${PORTVERSION:S/.//g}src
@@ -30,8 +30,8 @@ BINXS=		colrbook colrpick fontpick palette vib wevents xgamma
 CONFIG_CMD=	Configure
 PLIST_SUB=	WITHOUT_X11="@comment "
 .else
-USE_XLIB=	yes
-CFLAGS+=	-I${X11BASE}/include
+USE_XORG=	x11 xpm
+CFLAGS+=	-I${LOCALBASE}/include
 CONFIG_CMD=	X-Configure
 PLIST_SUB=	WITHOUT_X11=
 .endif
@@ -39,9 +39,9 @@ PLIST_SUB=	WITHOUT_X11=
 post-patch:
 	@${REINPLACE_CMD} -e "s|^CC.*|CC=${CC}|g ; \
 		 s|^CFLAGS.*|CFLAGS=${CFLAGS}|g ; \
-		 s|/usr/X11R6|${X11BASE}|g ; \
+		 s|/usr/X11R6|${LOCALBASE}|g ; \
 		 s|-lpthread|${PTHREAD_LIBS}| ; \
-		 s|^XLIBS.*|XLIBS=-L${X11BASE}/lib -lX11|g" \
+		 s|^XLIBS.*|XLIBS=-L${LOCALBASE}/lib -lX11|g" \
 		${WRKSRC}/config/${ARCH_NAME}/Makedefs
 	@${REINPLACE_CMD} -e 's|/opt/icon|${ICONDIR}|g' ${WRKSRC}/ipl/BuildBin
 	@${REINPLACE_CMD} -e 's|ld -Bshareable|\$$CC -shared|g ; \