summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--misc/gaim-ignorance/Makefile28
-rw-r--r--misc/gaim-ignorance/distinfo4
-rw-r--r--misc/gaim-ignorance/files/patch-ignorance.c14
-rw-r--r--misc/gaim-ignorance/pkg-descr2
-rw-r--r--misc/gaim-ignorance/pkg-plist5
-rw-r--r--net-im/gaim-ignorance/Makefile28
-rw-r--r--net-im/gaim-ignorance/distinfo4
-rw-r--r--net-im/gaim-ignorance/files/patch-ignorance.c14
-rw-r--r--net-im/gaim-ignorance/pkg-descr2
-rw-r--r--net-im/gaim-ignorance/pkg-plist5
10 files changed, 58 insertions, 48 deletions
diff --git a/misc/gaim-ignorance/Makefile b/misc/gaim-ignorance/Makefile
index 653321f97bff..bcc7f1b09bc1 100644
--- a/misc/gaim-ignorance/Makefile
+++ b/misc/gaim-ignorance/Makefile
@@ -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>
diff --git a/misc/gaim-ignorance/distinfo b/misc/gaim-ignorance/distinfo
index d93196f3fc15..2cf4e762a5f7 100644
--- a/misc/gaim-ignorance/distinfo
+++ b/misc/gaim-ignorance/distinfo
@@ -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
diff --git a/misc/gaim-ignorance/files/patch-ignorance.c b/misc/gaim-ignorance/files/patch-ignorance.c
new file mode 100644
index 000000000000..67e78267fde6
--- /dev/null
+++ b/misc/gaim-ignorance/files/patch-ignorance.c
@@ -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);
diff --git a/misc/gaim-ignorance/pkg-descr b/misc/gaim-ignorance/pkg-descr
index 77b5797770ba..89383a7dad62 100644
--- a/misc/gaim-ignorance/pkg-descr
+++ b/misc/gaim-ignorance/pkg-descr
@@ -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/
diff --git a/misc/gaim-ignorance/pkg-plist b/misc/gaim-ignorance/pkg-plist
index dcf245b54fee..3d44d048c0ae 100644
--- a/misc/gaim-ignorance/pkg-plist
+++ b/misc/gaim-ignorance/pkg-plist
@@ -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
diff --git a/net-im/gaim-ignorance/Makefile b/net-im/gaim-ignorance/Makefile
index 653321f97bff..bcc7f1b09bc1 100644
--- a/net-im/gaim-ignorance/Makefile
+++ b/net-im/gaim-ignorance/Makefile
@@ -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>
diff --git a/net-im/gaim-ignorance/distinfo b/net-im/gaim-ignorance/distinfo
index d93196f3fc15..2cf4e762a5f7 100644
--- a/net-im/gaim-ignorance/distinfo
+++ b/net-im/gaim-ignorance/distinfo
@@ -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
diff --git a/net-im/gaim-ignorance/files/patch-ignorance.c b/net-im/gaim-ignorance/files/patch-ignorance.c
new file mode 100644
index 000000000000..67e78267fde6
--- /dev/null
+++ b/net-im/gaim-ignorance/files/patch-ignorance.c
@@ -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);
diff --git a/net-im/gaim-ignorance/pkg-descr b/net-im/gaim-ignorance/pkg-descr
index 77b5797770ba..89383a7dad62 100644
--- a/net-im/gaim-ignorance/pkg-descr
+++ b/net-im/gaim-ignorance/pkg-descr
@@ -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/
diff --git a/net-im/gaim-ignorance/pkg-plist b/net-im/gaim-ignorance/pkg-plist
index dcf245b54fee..3d44d048c0ae 100644
--- a/net-im/gaim-ignorance/pkg-plist
+++ b/net-im/gaim-ignorance/pkg-plist
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 05:20:34 +0000