1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

- Update to 2.2 [1]

- Also copy ignorance.conf when installing from a package
- Unsilence post-install
- Polish the Makefile

[1]:
PR:		ports/87900
Submitted by:	maintainer
This commit is contained in:
Jean-Yves Lefort 2005-10-24 09:26:40 +00:00
parent ea9c48b7a5
commit 552c46f805
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=146226
10 changed files with 58 additions and 48 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= ignorance
PORTVERSION= 2.1
PORTVERSION= 2.2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -23,34 +23,24 @@ USE_BZIP2= yes
USE_LIBTOOL_VER=15
USE_REINPLACE= yes
EXAMPLESDIR_REL=${EXAMPLESDIR:S,^${PREFIX}/,,}
PLIST_SUB= EXAMPLESDIR_REL=${EXAMPLESDIR_REL}
SUB_FILES= pkg-message
BROKEN= "does not compile"
.if !defined(NOPORTDOCS)
PORTDOCS= README
.endif
post-extract:
@${REINPLACE_CMD} -e "s/ignorance.conf/ignorance.conf.sample/g" ${WRKSRC}/Makefile.in
@${MV} ${WRKSRC}/ignorance.conf ${WRKSRC}/ignorance.conf.sample
post-patch:
@${REINPLACE_CMD} -e 's|-g3||' ${WRKSRC}/configure
@${REINPLACE_CMD} -e "s/ignorance.conf/ignorance.conf.sample/g" ${WRKSRC}/Makefile.in
@${MV} ${WRKSRC}/ignorance.conf ${WRKSRC}/ignorance.conf.sample
post-install:
@${MKDIR} ${EXAMPLESDIR}
@${INSTALL_DATA} ${WRKSRC}/ignorance ${EXAMPLESDIR}
${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/ignorance ${EXAMPLESDIR}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif
@${CAT} ${PKGMESSAGE}
@if ${TEST} ! -f ${PREFIX}/etc/gaim/ignorance.conf; then \
if ${TEST} ! -f ${PREFIX}/etc/gaim/ignorance.conf; then \
${CP} ${PREFIX}/etc/gaim/ignorance.conf.sample ${PREFIX}/etc/gaim/ignorance.conf; \
fi
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
MD5 (ignorance-2.1.tar.bz2) = 7a81c440e733e9156433fdd5e1806472
SIZE (ignorance-2.1.tar.bz2) = 237880
MD5 (ignorance-2.2.tar.bz2) = 9d8fdc97751adc19f5871c0c7793e1f9
SIZE (ignorance-2.2.tar.bz2) = 282432

View File

@ -0,0 +1,14 @@
--- ignorance.c.orig Fri Oct 21 03:07:36 2005
+++ ignorance.c Mon Oct 24 11:16:17 2005
@@ -1637,9 +1637,10 @@
return -1;
}else if (pid){ //Parent
int rv;
+ int flags;
close (p[1]);
- int flags = fcntl (p[0], F_GETFL, 0);
+ flags = fcntl (p[0], F_GETFL, 0);
fcntl (p[0], F_SETFL, flags | O_NONBLOCK);
rv=read_nonblock(p[0],maxlen-chrs,EXEC_TIMEOUT,inp);

View File

@ -2,4 +2,4 @@ Ignorance is a content filtering plugin for Gaim. If you love Gaim for
chat, but find yourself missing the filtering features of clients like
zinc, then Ignorance is for you!
WWW: http://bard.sytes.net/ignorance/
WWW: http://freshmeat.net/projects/ignorance/

View File

@ -1,7 +1,8 @@
@comment $FreeBSD$
lib/gaim/ignorance.so
%%EXAMPLESDIR_REL%%/ignorance
%%EXAMPLESDIR%%/ignorance
@unexec if cmp -s %D/etc/gaim/ignorance.conf %D/etc/gaim/ignorance.conf.sample; then rm -f %D/etc/gaim/ignorance.conf;fi
etc/gaim/ignorance.conf.sample
@dirrm %%EXAMPLESDIR_REL%%
@exec [ -f %B/ignorance.conf ] || cp %B/%f %B/ignorance.conf
@dirrm %%EXAMPLESDIR%%
@unexec rmdir %D/etc/gaim/ 2>/dev/null || true

View File

@ -6,7 +6,7 @@
#
PORTNAME= ignorance
PORTVERSION= 2.1
PORTVERSION= 2.2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -23,34 +23,24 @@ USE_BZIP2= yes
USE_LIBTOOL_VER=15
USE_REINPLACE= yes
EXAMPLESDIR_REL=${EXAMPLESDIR:S,^${PREFIX}/,,}
PLIST_SUB= EXAMPLESDIR_REL=${EXAMPLESDIR_REL}
SUB_FILES= pkg-message
BROKEN= "does not compile"
.if !defined(NOPORTDOCS)
PORTDOCS= README
.endif
post-extract:
@${REINPLACE_CMD} -e "s/ignorance.conf/ignorance.conf.sample/g" ${WRKSRC}/Makefile.in
@${MV} ${WRKSRC}/ignorance.conf ${WRKSRC}/ignorance.conf.sample
post-patch:
@${REINPLACE_CMD} -e 's|-g3||' ${WRKSRC}/configure
@${REINPLACE_CMD} -e "s/ignorance.conf/ignorance.conf.sample/g" ${WRKSRC}/Makefile.in
@${MV} ${WRKSRC}/ignorance.conf ${WRKSRC}/ignorance.conf.sample
post-install:
@${MKDIR} ${EXAMPLESDIR}
@${INSTALL_DATA} ${WRKSRC}/ignorance ${EXAMPLESDIR}
${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/ignorance ${EXAMPLESDIR}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif
@${CAT} ${PKGMESSAGE}
@if ${TEST} ! -f ${PREFIX}/etc/gaim/ignorance.conf; then \
if ${TEST} ! -f ${PREFIX}/etc/gaim/ignorance.conf; then \
${CP} ${PREFIX}/etc/gaim/ignorance.conf.sample ${PREFIX}/etc/gaim/ignorance.conf; \
fi
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
MD5 (ignorance-2.1.tar.bz2) = 7a81c440e733e9156433fdd5e1806472
SIZE (ignorance-2.1.tar.bz2) = 237880
MD5 (ignorance-2.2.tar.bz2) = 9d8fdc97751adc19f5871c0c7793e1f9
SIZE (ignorance-2.2.tar.bz2) = 282432

View File

@ -0,0 +1,14 @@
--- ignorance.c.orig Fri Oct 21 03:07:36 2005
+++ ignorance.c Mon Oct 24 11:16:17 2005
@@ -1637,9 +1637,10 @@
return -1;
}else if (pid){ //Parent
int rv;
+ int flags;
close (p[1]);
- int flags = fcntl (p[0], F_GETFL, 0);
+ flags = fcntl (p[0], F_GETFL, 0);
fcntl (p[0], F_SETFL, flags | O_NONBLOCK);
rv=read_nonblock(p[0],maxlen-chrs,EXEC_TIMEOUT,inp);

View File

@ -2,4 +2,4 @@ Ignorance is a content filtering plugin for Gaim. If you love Gaim for
chat, but find yourself missing the filtering features of clients like
zinc, then Ignorance is for you!
WWW: http://bard.sytes.net/ignorance/
WWW: http://freshmeat.net/projects/ignorance/

View File

@ -1,7 +1,8 @@
@comment $FreeBSD$
lib/gaim/ignorance.so
%%EXAMPLESDIR_REL%%/ignorance
%%EXAMPLESDIR%%/ignorance
@unexec if cmp -s %D/etc/gaim/ignorance.conf %D/etc/gaim/ignorance.conf.sample; then rm -f %D/etc/gaim/ignorance.conf;fi
etc/gaim/ignorance.conf.sample
@dirrm %%EXAMPLESDIR_REL%%
@exec [ -f %B/ignorance.conf ] || cp %B/%f %B/ignorance.conf
@dirrm %%EXAMPLESDIR%%
@unexec rmdir %D/etc/gaim/ 2>/dev/null || true