Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Feb 2014 08:38:48 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r346463 - head/x11-wm/libdockapp
Message-ID:  <201402280838.s1S8cmjT078907@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri Feb 28 08:38:48 2014
New Revision: 346463
URL: http://svnweb.freebsd.org/changeset/ports/346463
QAT: https://qat.redports.org/buildarchive/r346463/

Log:
  Support stage
  USES=libtool

Modified:
  head/x11-wm/libdockapp/Makefile
  head/x11-wm/libdockapp/pkg-plist

Modified: head/x11-wm/libdockapp/Makefile
==============================================================================
--- head/x11-wm/libdockapp/Makefile	Fri Feb 28 08:35:59 2014	(r346462)
+++ head/x11-wm/libdockapp/Makefile	Fri Feb 28 08:38:48 2014	(r346463)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libdockapp
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	xride
@@ -10,31 +11,32 @@ MASTER_SITE_SUBDIR=	xride
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	Standard library for Window Maker dock apps
 
+OPTIONS_DEFINE=	EXAMPLES
+OPTIONS_SUB=	yes
+
+USES=		libtool
 USE_BZIP2=	yes
 USE_XORG=	xext xpm
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-font --without-examples
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
 post-install:
-	@${MKDIR} ${PREFIX}/lib/X11/fonts/dockapp
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/dockapp
 .for file in fonts.alias fonts.dir *.pcf.gz
-	${INSTALL_DATA} ${WRKSRC}/fonts/${file} ${PREFIX}/lib/X11/fonts/dockapp
+	${INSTALL_DATA} ${WRKSRC}/fonts/${file} ${STAGEDIR}${PREFIX}/lib/X11/fonts/dockapp
 .endfor
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for file in README
-	${INSTALL_DATA} ${WRKSRC}/examples/${file} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/${file} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-	@${MKDIR} ${EXAMPLESDIR}/basic
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/basic
 .for file in Imakefile README *.c *.xpm
-	${INSTALL_DATA} ${WRKSRC}/examples/basic/${file} ${EXAMPLESDIR}/basic
+	${INSTALL_DATA} ${WRKSRC}/examples/basic/${file} ${STAGEDIR}${EXAMPLESDIR}/basic
 .endfor
-	@${MKDIR} ${EXAMPLESDIR}/rectangles
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/rectangles
 .for file in Imakefile *.c
-	${INSTALL_DATA} ${WRKSRC}/examples/rectangles/${file} ${EXAMPLESDIR}/rectangles
+	${INSTALL_DATA} ${WRKSRC}/examples/rectangles/${file} ${STAGEDIR}${EXAMPLESDIR}/rectangles
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/x11-wm/libdockapp/pkg-plist
==============================================================================
--- head/x11-wm/libdockapp/pkg-plist	Fri Feb 28 08:35:59 2014	(r346462)
+++ head/x11-wm/libdockapp/pkg-plist	Fri Feb 28 08:38:48 2014	(r346463)
@@ -3,18 +3,19 @@ lib/libdockapp.a
 lib/libdockapp.la
 lib/libdockapp.so
 lib/libdockapp.so.2
+lib/libdockapp.so.2.0.0
 lib/X11/fonts/dockapp/fonts.alias
 lib/X11/fonts/dockapp/fonts.dir
 lib/X11/fonts/dockapp/luxel-ascii-06x09.pcf.gz
 lib/X11/fonts/dockapp/seg7-ascii-05x07.pcf.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/Imakefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/ball_red.xpm
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/basic.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rectangles/Imakefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rectangles/rectangles.c
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rectangles
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/basic
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%EXAMPLES%%%%EXAMPLESDIR%%/README
+%%EXAMPLES%%%%EXAMPLESDIR%%/basic/Imakefile
+%%EXAMPLES%%%%EXAMPLESDIR%%/basic/README
+%%EXAMPLES%%%%EXAMPLESDIR%%/basic/ball_red.xpm
+%%EXAMPLES%%%%EXAMPLESDIR%%/basic/basic.c
+%%EXAMPLES%%%%EXAMPLESDIR%%/rectangles/Imakefile
+%%EXAMPLES%%%%EXAMPLESDIR%%/rectangles/rectangles.c
+%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/rectangles
+%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/basic
+%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm lib/X11/fonts/dockapp



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402280838.s1S8cmjT078907>