Bug 189796 - [maintainer-upgrade] [patch] www/mod_authn_otp to version 1.1.6 and converted to staging
Summary: [maintainer-upgrade] [patch] www/mod_authn_otp to version 1.1.6 and converted...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-apache (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-14 12:20 UTC by alex
Modified: 2014-05-18 21:16 UTC (History)
0 users

See Also:


Attachments
file.diff (293 bytes, patch)
2014-05-14 12:20 UTC, alex
no flags Details | Diff
file.diff (938 bytes, patch)
2014-05-14 12:20 UTC, alex
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description alex 2014-05-14 12:20:00 UTC
Update to version 1.1.6 of mod-authn-otp and also converted to staging.

Fix: PORTNAME=      mod_authn_otp
-PORTVERSION=   1.1.5
+PORTVERSION=   1.1.6
 CATEGORIES=    www
 MASTER_SITES=  http://mod-authn-otp.googlecode.com/files/ \
                http://alex.bmg.gv.at/programs/
@@ -12,32 +12,29 @@
 MAINTAINER=    alex@hugo.bmg.gv.at
 COMMENT=       Apache module for one-time password authentication

-
 GNU_CONFIGURE= yes
 USE_APACHE=    22
-
-MAN1=          otptool.1
+AP_FAST_BUILD=  yes
+AP_GENPLIST=    yes

 PORTEXAMPLES=  users.sample

-NO_STAGE=      yes
-
 OPTIONS_DEFINE=        EXAMPLES

 .include <bsd.port.options.mk>

-CONFIGURE_ARGS=        --prefix=${PREFIX} \
-               --mandir=${MANPREFIX}/man
+CONFIGURE_ARGS=        --prefix=${STAGEDIR}${PREFIX} \
+               --mandir=${STAGEDIR}${MANPREFIX}/man

 post-configure:
        @${REINPLACE_CMD} 's|CFLAGS =|CFLAGS ?=|' \
                ${WRKSRC}/Makefile

 post-install:
-       @${APXS} -e -A -n ${PORTNAME:S/mod_//} ${APACHEMODDIR}/${PORTNAME}.so
+       @${APXS} -e -A -n ${PORTNAME:S/mod_//} ${STAGEDIR}${APACHEMODDIR}/${PORTNAME}.so
 .if ${PORT_OPTIONS:MEXAMPLES}
-       ${MKDIR} ${EXAMPLESDIR}/
-       ${INSTALL_DATA} ${WRKSRC}/users.sample ${EXAMPLESDIR}/
+       ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+       ${INSTALL_DATA} ${WRKSRC}/users.sample ${STAGEDIR}${EXAMPLESDIR}/
 .endif

 .include <bsd.port.mk>
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-05-14 12:20:05 UTC
Responsible Changed
From-To: freebsd-ports-bugs->apache

apache@ wants this port PRs (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2014-05-18 20:54:00 UTC
Author: ohauer
Date: Sun May 18 19:53:56 2014
New Revision: 354464
URL: http://svnweb.freebsd.org/changeset/ports/354464
QAT: https://qat.redports.org/buildarchive/r354464/

Log:
  - update to 1.1.6
  - add stage support
  - add LICENSE
  
  PR:		ports/189796
  Submitted by:	Alexander Hausner <alex@hugo.bmg.gv.at> (maintainer)

Modified:
  head/www/mod_authn_otp/Makefile
  head/www/mod_authn_otp/distinfo
  head/www/mod_authn_otp/pkg-plist

Modified: head/www/mod_authn_otp/Makefile
==============================================================================
--- head/www/mod_authn_otp/Makefile	Sun May 18 19:44:27 2014	(r354463)
+++ head/www/mod_authn_otp/Makefile	Sun May 18 19:53:56 2014	(r354464)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mod_authn_otp
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 CATEGORIES=	www
 MASTER_SITES=	http://mod-authn-otp.googlecode.com/files/ \
 		http://alex.bmg.gv.at/programs/
@@ -12,32 +12,26 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	alex@hugo.bmg.gv.at
 COMMENT=	Apache module for one-time password authentication
 
+LICENSE=	APACHE20
 
 GNU_CONFIGURE=	yes
 USE_APACHE=	22
 
-MAN1=		otptool.1
-
 PORTEXAMPLES=	users.sample
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	EXAMPLES
 
 .include <bsd.port.options.mk>
 
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--mandir=${MANPREFIX}/man
-
 post-configure:
 	@${REINPLACE_CMD} 's|CFLAGS =|CFLAGS ?=|' \
 		${WRKSRC}/Makefile
 
+pre-install:
+	@${MKDIR} ${STAGEDIR}/${PREFIX}/${APACHEMODDIR}
+
 post-install:
-	@${APXS} -e -A -n ${PORTNAME:S/mod_//} ${APACHEMODDIR}/${PORTNAME}.so
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}/
-	${INSTALL_DATA} ${WRKSRC}/users.sample ${EXAMPLESDIR}/
-.endif
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/users.sample ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/www/mod_authn_otp/distinfo
==============================================================================
--- head/www/mod_authn_otp/distinfo	Sun May 18 19:44:27 2014	(r354463)
+++ head/www/mod_authn_otp/distinfo	Sun May 18 19:53:56 2014	(r354464)
@@ -1,2 +1,2 @@
-SHA256 (apache2/mod_authn_otp-1.1.5.tar.gz) = 119f445518ccf300b8c71e4cb3391bc942cf68e8b0fc8df3d1624ca3aceef9b1
-SIZE (apache2/mod_authn_otp-1.1.5.tar.gz) = 97889
+SHA256 (apache2/mod_authn_otp-1.1.6.tar.gz) = c6ea1776128cadb98068fea616013dd0bf2d8f8dfaf12e01fde1cdf7bcfc8837
+SIZE (apache2/mod_authn_otp-1.1.6.tar.gz) = 99838

Modified: head/www/mod_authn_otp/pkg-plist
==============================================================================
--- head/www/mod_authn_otp/pkg-plist	Sun May 18 19:44:27 2014	(r354463)
+++ head/www/mod_authn_otp/pkg-plist	Sun May 18 19:53:56 2014	(r354464)
@@ -1,5 +1,6 @@
-@unexec sed -i '' -E '/LoadModule[[:blank:]]+authn_otp_module/d' %D/%%APACHEETCDIR%%/httpd.conf
-%%APACHEMODDIR%%/mod_authn_otp.so
-@exec %D/sbin/apxs -e -A -n authn_otp %D/%F
-@unexec echo \"Don\'t forget to remove all mod_authn_otp-related directives in your httpd.conf\"
 bin/otptool
+@unexec sed -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf
+%%APACHEMODDIR%%/%%AP_MODULE%%
+@exec %D/sbin/apxs -e %%AP_MOD_EN%% -n %%AP_NAME%% %D/%F
+@unexec echo \"Don\'t forget to remove all mod_%%AP_NAME%%-related directives in your httpd.conf\"
+man/man1/otptool.1.gz
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Olli Hauer freebsd_committer freebsd_triage 2014-05-18 21:14:38 UTC
State Changed
From-To: open->closed

Committed with minor changes, 
Thanks!