From a34fc12cfc6ae2d0c2ec81051765f35b4068bb4f Mon Sep 17 00:00:00 2001
From: will <will@FreeBSD.org>
Date: Sun, 30 Jul 2000 02:00:50 +0000
Subject: Fix my not-tested-enough KDE2-related ports.  :-(

After short discussion with Imura-san, back out GIF-by-default until I can
confirm whether or not there are license issues with Unisys.  I will deal
with this later.  I should note that I'd committed to qt2[12] previously
without conferring with him on the GIF issue first.

One big ouchie: I didn't even set MASTER_SITE/MASTER_SITE_SUBDIR on qt22
properly.. but oh well.  Nobody's perfect.  :-)

Things should be un-broken now.. please test these ports!  I'll be trying
to update them to a new snap after a week or so.

Pointy hat:				will
Patches graciously submitted by:	nra
---
 x11-toolkits/qt31/Makefile | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'x11-toolkits/qt31')

diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 70beda5..ff3d42a 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -8,15 +8,15 @@
 PORTNAME=	qt
 PORTVERSION=	20000724A
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	snapshots/current
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	will
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-copy
 USE_BZIP2=	yes
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
@@ -24,12 +24,17 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm \
-		-gif -I${LOCALBASE}/include -L${LOCALBASE}/lib
+		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	QTDIR=${WRKSRC}
 MAKE_ENV=	QTDIR=${WRKSRC}
 
 CONFIG=		${WRKSRC}/configs/freebsd-g++-shared
 
+.if defined(QT_GIF_AVAILABLE) || defined(HAVE_UNISYS_LICENSE)
+CONFIGURE_ARGS+=-gif
+RESTRICTED=	"Requires a license from UNISYS"
+.endif
+
 .if !defined(NOPORTDOCS)
 .include "${.CURDIR}/files/manpages"
 .endif
@@ -70,8 +75,8 @@ do-install:
 	${INSTALL_DATA} include/*.h ${PREFIX}/include/qt2 ; \
 	${INSTALL_DATA} lib/libqgl.a ${PREFIX}/lib ; \
 	${INSTALL_DATA} lib/libqxt.a ${PREFIX}/lib ; \
-	${INSTALL_DATA} lib/libqt2.so.3 ${PREFIX}/lib )
-	${LN} -sf libqt2.so.3 ${PREFIX}/lib/libqt2.so
+	${INSTALL_DATA} lib/libqt2.so.4 ${PREFIX}/lib )
+	${LN} -sf libqt2.so.4 ${PREFIX}/lib/libqt2.so
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/qt2/html
-- 
cgit v1.1