svn commit: r332317 - in head/security/scanhill: . files

[Renato Botelho]

Author: garga
Date: Thu Oct 31 23:44:49 2013
New Revision: 332317
URL: http://svnweb.freebsd.org/changeset/ports/332317

Log:
  . Simplify Makefile
  . Use space on WWW line

Added:
  head/security/scanhill/files/
  head/security/scanhill/files/patch-configure   (contents, props changed)
Modified:
  head/security/scanhill/Makefile
  head/security/scanhill/pkg-descr   (contents, props changed)

Modified: head/security/scanhill/Makefile
==============================================================================
--- head/security/scanhill/Makefile	Thu Oct 31 23:43:44 2013	(r332316)
+++ head/security/scanhill/Makefile	Thu Oct 31 23:44:49 2013	(r332317)
@@ -19,12 +19,8 @@ PORTDOCS=	README.txt INSTALL.txt mysql.s
 
 OPTIONS_DEFINE=	MYSQL DOCS
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-CONFIGURE_ARGS+=	--enable-mysql
-USE_MYSQL=		yes
-.endif
+MYSQL_USE=	MYSQL=yes
+MYSQL_CONFIGURE_ENABLE=	mysql
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
@@ -32,14 +28,9 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/scanhill ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/scanhill.conf ${STAGEDIR}${PREFIX}/etc/scanhill.conf-dist
-.if !exists(${PREFIX}/etc/scanhill.conf)
-	${INSTALL_DATA} ${WRKSRC}/scanhill.conf ${STAGEDIR}${PREFIX}/etc/
-.endif
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-. for f in ${PORTDOCS}
+.for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-. endfor
-.endif
+.endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/security/scanhill/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/scanhill/files/patch-configure	Thu Oct 31 23:44:49 2013	(r332317)
@@ -0,0 +1,11 @@
+--- configure.orig	2013-10-30 11:38:52.000000000 -0200
++++ configure	2013-10-30 11:39:25.000000000 -0200
+@@ -975,7 +975,7 @@
+ done
+ 
+       # Check whether --enable-mysql or --disable-mysql was given.
+-if test "${enable_mysql+set}" = set; then
++if test "${enable_mysql}" = "yes"; then
+   enableval="$enable_mysql"
+   
+ 	for ac_hdr in mysql/mysql.h

Modified: head/security/scanhill/pkg-descr
==============================================================================
--- head/security/scanhill/pkg-descr	Thu Oct 31 23:43:44 2013	(r332316)
+++ head/security/scanhill/pkg-descr	Thu Oct 31 23:44:49 2013	(r332317)
@@ -5,4 +5,4 @@ used, stored instant messages can be rea
 written in PHP language. Please see the INSTALL.txt file for instructions on
 how to install, configure and run EnderUNIX scanhill.
 
-WWW:	http://www.enderunix.org/scanhill/
+WWW: http://www.enderunix.org/scanhill/