svn commit: r347762 - head/x11-toolkits/gai

[Koop Mast]

Author: kwm
Date: Mon Mar 10 14:53:49 2014
New Revision: 347762
URL: http://svnweb.freebsd.org/changeset/ports/347762
QAT: https://qat.redports.org/buildarchive/r347762/

Log:
  Disable gnome-panel support. gnome-panel will be updated to a incompatible
  version in the near future.
  While here stagify and use new lib_depends syntax.

Modified:
  head/x11-toolkits/gai/Makefile

Modified: head/x11-toolkits/gai/Makefile
==============================================================================
--- head/x11-toolkits/gai/Makefile	Mon Mar 10 14:52:46 2014	(r347761)
+++ head/x11-toolkits/gai/Makefile	Mon Mar 10 14:53:49 2014	(r347762)
@@ -3,22 +3,23 @@
 
 PORTNAME=	gai
 PORTVERSION=	0.5.10
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	SF/${PORTNAME}/GAI%20-%20Library/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	lx at redundancy.redundancy.org
 COMMENT=	General Applet Interface Library
 
-LIB_DEPENDS=	gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
 
 USE_BZIP2=	yes
 USES=		pkgconfig
 USE_GL=		gl
 USE_SDL=	sdl
-USE_GNOME=	gnomepanel libgnomeui
+USE_GNOME=	libgnomeui
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDLCONF=${SDL_CONFIG}
+CONFIGURE_ARGS=	--disable-gnome
 CPPFLAGS+=	`pkg-config --cflags libgnomeui-2.0`
 
 PLIST_FILES=	include/gai/gai.h lib/libgai.so.${PORTVERSION} \
@@ -28,7 +29,6 @@ PLIST_DIRS=	include/gai
 PORTDOCS=	*
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s|sdl-config --|${SDL_CONFIG} --|g; \
 		s|/usr/X11R6|${LOCALBASE}|g" ${WRKSRC}/configure
@@ -36,17 +36,17 @@ post-patch:
 post-install:
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/docs && \
-	${FIND} * -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \
-	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
+	${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
+	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DOCSDIR}/{}" \;
 .endif
 .for dir in docking examples templates
 	cd ${WRKSRC} && \
-	${FIND} ${dir} -type d -exec ${MKDIR} "${EXAMPLESDIR}/{}" \; && \
-	${FIND} ${dir} -type f -exec ${INSTALL_DATA} "{}" "${EXAMPLESDIR}/{}" \;
+	${FIND} ${dir} -type d -exec ${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/{}" \; && \
+	${FIND} ${dir} -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${EXAMPLESDIR}/{}" \;
 .endfor
-	@${FIND} ${EXAMPLESDIR} -type f | \
-		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
-	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
-		${SED} "s,^${PREFIX}/, at dirrm ," >> ${TMPPLIST}
+	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -type f | \
+		${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
+	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -type d | ${SORT} -r | \
+		${SED} "s,^${STAGEDIR}${PREFIX}/, at dirrm ," >> ${TMPPLIST}
 
 .include <bsd.port.mk>