svn commit: r353605 - in head/www/WebMagick: . files

[Andrey A. Chernov]

Author: ache
Date: Sat May 10 21:08:31 2014
New Revision: 353605
URL: http://svnweb.freebsd.org/changeset/ports/353605
QAT: https://qat.redports.org/buildarchive/r353605/

Log:
  Convert to stage

Modified:
  head/www/WebMagick/Makefile
  head/www/WebMagick/files/patch-Makefile.am
  head/www/WebMagick/pkg-plist

Modified: head/www/WebMagick/Makefile
==============================================================================
--- head/www/WebMagick/Makefile	Sat May 10 21:07:43 2014	(r353604)
+++ head/www/WebMagick/Makefile	Sat May 10 21:08:31 2014	(r353605)
@@ -4,6 +4,7 @@
 PORTNAME=	WebMagick
 PORTVERSION=	2.03p24
 DISTVERSION=	2.03pre24
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www graphics
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}-beta/${DISTVERSION}
@@ -13,14 +14,16 @@ COMMENT=	Image Web Generator - recursive
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=    libMagickCore.so:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS=	p5-Sort-Naturally>=0:${PORTSDIR}/textproc/p5-Sort-Naturally
 
 USES=		shebangfix perl5
 USE_AUTOTOOLS=  autoconf aclocal automake
-AUTOMAKE_ARGS+=	--add-missing
+AUTOMAKE_ARGS+= --add-missing
 INFO=		webmagick
-CONFIGURE_ENV=	webmagick_cv_rootpath=${PREFIX}/www/data \
+MAKE_ARGS+=	ICON_INSTALL_DIR=${STAGEDIR}${PREFIX}/www/data/webmagick \
+		ETC_INSTALL_DIR=${STAGEDIR}${PREFIX}/etc
+CONFIGURE_ENV+=	webmagick_cv_rootpath=${PREFIX}/www/data \
 		webmagick_cv_iconpath=webmagick \
 		webmagick_cv_prefixpath="" \
 		webmagick_cv_htimage="" \
@@ -31,7 +34,6 @@ SHEBANG_FILES=	utils/aub \
 		utils/help2man \
 		utils/make_dir_index.pl
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if !exists(${LOCALBASE}/bin/xlsfonts)
@@ -42,16 +44,7 @@ WITHOUT_X11=	yes
 CONFIGURE_ENV+=with_x=no
 .endif
 
-MAN1=		webmagick.1
-
 pre-install:
-	@${MKDIR} ${PREFIX}/www/data
-
-post-install:
-	cd ${WRKSRC}; \
-	if [ ! -f ${PREFIX}/etc/webmagickrc ] ; then \
-		${INSTALL_DATA} webmagickrc ${PREFIX}/etc; \
-	fi; \
-	${INSTALL_DATA} webmagickrc ${PREFIX}/etc/webmagickrc.dist
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/data
 
 .include <bsd.port.post.mk>

Modified: head/www/WebMagick/files/patch-Makefile.am
==============================================================================
--- head/www/WebMagick/files/patch-Makefile.am	Sat May 10 21:07:43 2014	(r353604)
+++ head/www/WebMagick/files/patch-Makefile.am	Sat May 10 21:08:31 2014	(r353605)
@@ -1,11 +1,11 @@
---- Makefile.am.bak	2002-10-23 03:54:54.000000000 +0400
-+++ Makefile.am	2012-04-07 10:05:09.000000000 +0400
+--- Makefile.am.orig	2002-10-23 03:54:54.000000000 +0400
++++ Makefile.am	2014-05-11 00:27:56.000000000 +0400
 @@ -24,7 +24,7 @@
  	  $(INSTALL_SCRIPT) $$file $(ICON_INSTALL_DIR) ; \
  	done
  	$(mkinstalldirs) $(ETC_INSTALL_DIR)
 -	$(INSTALL_DATA) webmagickrc $(ETC_INSTALL_DIR)/webmagickrc
-+#        $(INSTALL_DATA) webmagickrc $(ETC_INSTALL_DIR)/webmagickrc
++	$(INSTALL_DATA) webmagickrc $(ETC_INSTALL_DIR)/webmagickrc.dist
  
  # Additional files to distribute
  EXTRA_DIST = INSTALL.generic MANIFEST TODO webmagick.in \

Modified: head/www/WebMagick/pkg-plist
==============================================================================
--- head/www/WebMagick/pkg-plist	Sat May 10 21:07:43 2014	(r353604)
+++ head/www/WebMagick/pkg-plist	Sat May 10 21:08:31 2014	(r353605)
@@ -2,6 +2,7 @@
 etc/webmagickrc.dist
 @exec [ ! -f %B/webmagickrc ] && cp %B/%f %B/webmagickrc
 bin/webmagick
+man/man1/webmagick.1.gz
 www/data/webmagick/aqua_next.gif
 www/data/webmagick/aqua_prev.gif
 www/data/webmagick/blank.html