svn commit: r360725 - in head/security: cracklib racoon2 racoon2/files

Cy Schubert cy at FreeBSD.org
Sat Jul 5 07:10:27 UTC 2014 

Author: cy
Date: Sat Jul  5 07:10:26 2014
New Revision: 360725
URL: http://svnweb.freebsd.org/changeset/ports/360725
QAT: https://qat.redports.org/buildarchive/r360725/

Log:
  Stagify and adopt these orphans.

Added:
  head/security/racoon2/files/patch-pskgen-Makefile.in   (contents, props changed)
Modified:
  head/security/cracklib/Makefile
  head/security/racoon2/Makefile
  head/security/racoon2/pkg-plist

Modified: head/security/cracklib/Makefile
==============================================================================
--- head/security/cracklib/Makefile	Sat Jul  5 06:51:06 2014	(r360724)
+++ head/security/cracklib/Makefile	Sat Jul  5 07:10:26 2014	(r360725)
@@ -10,7 +10,7 @@ CATEGORIES+=	python
 MASTER_SITES=	SF \
 		LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/}
 
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= 	cy at FreeBSD.org
 COMMENT?=	Password-checking library
 
 LICENSE=	LGPL21
@@ -20,7 +20,6 @@ DICTFILE=	${DICTPATH}/pw_dict
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=--with-default-dict=${DICTPATH}
 USE_LDCONFIG=	yes
-NO_STAGE=	yes
 
 .if defined(PYTHON_SLAVEPORT)
 USE_PYTHON=	yes
@@ -54,7 +53,42 @@ PLIST_FILES=	include/crack.h \
 		sbin/cracklib-unpacker \
 		sbin/create-cracklib-dict \
 		%%DATADIR%%/cracklib-small \
-		%%DATADIR%%/cracklib.magic
+		%%DATADIR%%/cracklib.magic \
+		share/locale/as/LC_MESSAGES/cracklib.mo \
+		share/locale/bn_IN/LC_MESSAGES/cracklib.mo \
+		share/locale/cs/LC_MESSAGES/cracklib.mo \
+		share/locale/da/LC_MESSAGES/cracklib.mo \
+		share/locale/de/LC_MESSAGES/cracklib.mo \
+		share/locale/el/LC_MESSAGES/cracklib.mo \
+		share/locale/es/LC_MESSAGES/cracklib.mo \
+		share/locale/fi/LC_MESSAGES/cracklib.mo \
+		share/locale/fr/LC_MESSAGES/cracklib.mo \
+		share/locale/gu/LC_MESSAGES/cracklib.mo \
+		share/locale/hi/LC_MESSAGES/cracklib.mo \
+		share/locale/hu/LC_MESSAGES/cracklib.mo \
+		share/locale/it/LC_MESSAGES/cracklib.mo \
+		share/locale/ja/LC_MESSAGES/cracklib.mo \
+		share/locale/kn/LC_MESSAGES/cracklib.mo \
+		share/locale/ko/LC_MESSAGES/cracklib.mo \
+		share/locale/lt/LC_MESSAGES/cracklib.mo \
+		share/locale/ml/LC_MESSAGES/cracklib.mo \
+		share/locale/mr/LC_MESSAGES/cracklib.mo \
+		share/locale/nb/LC_MESSAGES/cracklib.mo \
+		share/locale/nl/LC_MESSAGES/cracklib.mo \
+		share/locale/or/LC_MESSAGES/cracklib.mo \
+		share/locale/pa/LC_MESSAGES/cracklib.mo \
+		share/locale/pl/LC_MESSAGES/cracklib.mo \
+		share/locale/pt/LC_MESSAGES/cracklib.mo \
+		share/locale/pt_BR/LC_MESSAGES/cracklib.mo \
+		share/locale/ru/LC_MESSAGES/cracklib.mo \
+		share/locale/sk/LC_MESSAGES/cracklib.mo \
+		share/locale/sl_SI/LC_MESSAGES/cracklib.mo \
+		share/locale/ta/LC_MESSAGES/cracklib.mo \
+		share/locale/te/LC_MESSAGES/cracklib.mo \
+		share/locale/tr/LC_MESSAGES/cracklib.mo \
+		share/locale/uk/LC_MESSAGES/cracklib.mo \
+		share/locale/zh_CN/LC_MESSAGES/cracklib.mo \
+		share/locale/zh_TW/LC_MESSAGES/cracklib.mo
 .endif
 
 .if defined(PYTHON_SLAVEPORT)
@@ -66,13 +100,14 @@ regression-test: extract
 	${PYTHON_CMD} -c \
 	"from test_${PORTNAME} import run; run(use_dictpath=\"${DICTFILE}\")")
 .else
-MAN3=		${PORTNAME}.3
-MLINKS=		${PORTNAME}.3 FascistCheck.3
+PLIST_FILES+=	man/man3/${PORTNAME}.3.gz \
+		@exec\ ln\ -s\ man/man3/${PORTNAME}.3.gz\ man/man3/FascistCheck.3.gz \
+		@unexec\ rm\ man/man3/FascistCheck.3.gz
 
 post-install:
-	${INSTALL_MAN} ${FILESDIR}/${MAN3} ${MAN3PREFIX}/man/man3/
-	@${MKDIR} ${DICTPATH}
-	${INSTALL_DATA} ${FILESDIR}/pw_dict* ${DICTPATH}/
+	${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
+	@${MKDIR} ${STAGEDIR}${DICTPATH}
+	${INSTALL_DATA} ${FILESDIR}/pw_dict* ${STAGEDIR}${DICTPATH}/
 .endif
 
 .include <bsd.port.mk>

Modified: head/security/racoon2/Makefile
==============================================================================
--- head/security/racoon2/Makefile	Sat Jul  5 06:51:06 2014	(r360724)
+++ head/security/racoon2/Makefile	Sat Jul  5 07:10:26 2014	(r360725)
@@ -8,23 +8,26 @@ CATEGORIES=	security net ipv6
 MASTER_SITES=	ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= 	cy at FreeBSD.org
 COMMENT=	Racoon2 IPsec daemon
 
+USES=		perl5
 USE_RC_SUBR=	YES
 USE_OPENSSL=	YES
 
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--prefix=${STAGEDIR}${PREFIX}
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/racoon2
 CONFIGURE_ENV=	YACC=/usr/bin/yacc
 
 OPTIONS_DEFINE=	KINK DOCS
 KINK_DESC=	Enable KINK support
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
+PLIST_SUB+=	PFX=${PREFIX}
+
 pre-configure:
 .if ${PORT_OPTIONS:MKINK}
 .if !exists(/usr/lib/libkrb5.a)
@@ -34,7 +37,6 @@ PLIST_SUB+=	KINK="@comment "
 .else
 CONFIGURE_ARGS+=	--enable-kinkd
 MAKE_ENV=	WITH_KINK=yes
-MAN8+=		kinkd.8
 PLIST_SUB+=	KINK=""
 .endif
 .else
@@ -52,23 +54,26 @@ PORTDOCS+=	kinkd-install.ja.txt kinkd-st
 .endif
 .endif
 
-MAN8+=		spmd.8 spmdctl.8 pskgen.8 iked.8
-
 post-patch:
 .if ${PORT_OPTIONS:MDOCS}
 .for FILE in ${PORTDOCS}
-	@${REINPLACE_CMD} -e 's|/usr/local/racoon2|${LOCALBASE}|' ${WRKSRC}/doc/${FILE}
+	@${REINPLACE_CMD} -e 's|/usr/local/racoon2|${PREFIX}|' ${WRKSRC}/doc/${FILE}
 .endfor
 .endif
 
+post-configure:
+	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e '/INSTALL/s|\$$([a-z].*dir)|${STAGEDIR}&|'
+	@${REINPLACE_CMD} -e '1s|/usr/bin/perl|${PERL}|' ${WRKSRC}/pskgen/pskgen
+	@${REINPLACE_CMD} -e '/^prefix=/s|/usr/local|${STAGEDIR}${PREFIX}|;/\/var\/run\/racoon2/d' ${WRKSRC}/samples/Makefile
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.jp ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.jp ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .for FILE in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 	@if [ -z `/sbin/sysctl -a | ${GREP} -q ipsec && echo ipsec` ]; then \

Added: head/security/racoon2/files/patch-pskgen-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/racoon2/files/patch-pskgen-Makefile.in	Sat Jul  5 07:10:26 2014	(r360725)
@@ -0,0 +1,10 @@
+--- pskgen/Makefile.in.orig	2007-12-11 23:12:22.000000000 -0800
++++ pskgen/Makefile.in	2014-07-04 13:38:23.919692384 -0700
+@@ -21,7 +21,6 @@
+ 	$(INSTALL_SCRIPT) $(PROG) $(sbindir)
+ 	$(INSTALL_DATA) $(PROG).8 $(mandir)/man8
+ 	$(INSTALL) -d $(prefix)/etc/racoon2
+-	sh ./autogen.spmd.pwd
+ 
+ depend:
+ 

Modified: head/security/racoon2/pkg-plist
==============================================================================
--- head/security/racoon2/pkg-plist	Sat Jul  5 06:51:06 2014	(r360724)
+++ head/security/racoon2/pkg-plist	Sat Jul  5 07:10:26 2014	(r360725)
@@ -3,7 +3,6 @@ sbin/iked
 sbin/spmd
 sbin/spmdctl
 sbin/pskgen
-etc/racoon2/spmd.pwd
 etc/racoon2/default.conf.sample
 etc/racoon2/local-test.conf.sample
 etc/racoon2/racoon2.conf.sample
@@ -31,6 +30,14 @@ etc/rc.d/spmd
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.jp
 %%PORTDOCS%%%%DOCSDIR%%/README
+man/man8/spmd.8.gz
+man/man8/spmdctl.8.gz
+man/man8/pskgen.8.gz
+man/man8/iked.8.gz
+%%KINK%%man/man8/kinkd.8.gz
+ at exec test -f %%PFX%%/etc/racoon2/spmd.pwd && mv %%PFX%%/etc/racoon2/spmd.pwd %%PFX%%/etc/racoon2/spmd.pwd.bak && %%PFX%%/pskgen -r -o %%PFX%%/etc/racoon2/spmd.pwd
+ at unexec rm -f %%PFX/etc/racoon2/spmd.pwd
+ at exec /usr/sbin/install -d -o 0 -g 0 -m 700 /var/run/racoon2
 @dirrm etc/racoon2/cert
 @dirrm etc/racoon2/hook/ph1-up.d
 @dirrm etc/racoon2/hook/ph1-down.d

More information about the svn-ports-head mailing list