Attachment #113877 for bug #155486

View | Details | Raw Unified | Return to bug 155486
Collapse All | Expand All





PORTNAME=	ddclient
PORTVERSION=	3.8.0
PORTREVISION=	2
CATEGORIES=	dns
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}


post-patch:
	@${GREP} -lr '/usr' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g'
	@${REINPLACE_CMD} \
		-e 's|/etc/ddclient|${PREFIX}/etc|' \
		-e 's|/tmp|/var/tmp|' \
		-e 's|/var/cache/ddclient|/var/tmp|' \
		-e '/PATH/s|/etc:/usr/local/lib:||' \
		-e 's|/usr.*perl|${PERL}|g' \
		-e 's|/usr/local|${LOCALBASE}|g' \
		-e 's|/etc/ddclient|${PREFIX}/etc|' \
		${WRKSRC}/ddclient

do-install:
	@${INSTALL_DATA} ${WRKSRC}/sample-etc_ddclient.conf ${PREFIX}/etc/ddclient.conf.sample




--- ddclient.orig	2011-03-11 00:00:19.394750047 -0800
+++ ddclient	2011-03-11 00:04:28.967751644 -0800
@@ -2094,10 +2094,14 @@
     } elsif (defined($sub) && &$sub($host)) {
 	$update = 1;
 
-    } elsif (($cache{$host}{'static'} ne $config{$host}{'static'}) ||
-	     ($cache{$host}{'wildcard'} ne $config{$host}{'wildcard'}) ||
-	     ($cache{$host}{'mx'} ne $config{$host}{'mx'}) ||
-	     ($cache{$host}{'backupmx'} ne $config{$host}{'backupmx'})) {
+    } elsif ((defined($cache{$host}{'static'}) && defined($config{$host}{'static'}) &&
+	     ($cache{$host}{'static'} ne $config{$host}{'static'})) ||
+	     (defined($cache{$host}{'wildcard'}) && defined($config{$host}{'wildcard'}) &&
+	     ($cache{$host}{'wildcard'} ne $config{$host}{'wildcard'})) ||
+	     (defined($cache{$host}{'mx'}) && defined($config{$host}{'mx'}) &&
+	     ($cache{$host}{'mx'} ne $config{$host}{'mx'})) ||
+	     (defined($cache{$host}{'backupmx'}) && defined($config{$host}{'backupmx'}) &&
+	     ($cache{$host}{'backupmx'} ne $config{$host}{'backupmx'})) ) {
 	info("updating %s because host settings have been changed.", $host);
 	$update = 1;


Return to bug 155486

Lines 7-13 Link Here

(-)Makefile (-3 / +5 lines)
7		7
8	PORTNAME= ddclient	8	PORTNAME= ddclient
9	PORTVERSION= 3.8.0	9	PORTVERSION= 3.8.0
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= dns	11	CATEGORIES= dns
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
13		13
Lines 35-45 Link Here
35	post-patch:	35	post-patch:
36	@${GREP} -lr '/usr' ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} -e 's\|/usr\|${PREFIX}\|g'	36	@${GREP} -lr '/usr' ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} -e 's\|/usr\|${PREFIX}\|g'
37	@${REINPLACE_CMD} \	37	@${REINPLACE_CMD} \
38	-e 's\|/etc/ddclient\|${PREFIX}/etc\|' \
39	-e 's\|/tmp\|/var/tmp\|' \	38	-e 's\|/tmp\|/var/tmp\|' \
40	-e 's\|/var/cache/ddclient\|/var/tmp\|' \	39	-e 's\|/var/cache/ddclient\|/var/tmp\|' \
41	-e '/PATH/s\|/etc:/usr/local/lib:\|\|' \	40	-e '/PATH/s\|/etc:/usr/local/lib:\|\|' \
42	-e 's\|/usr.*perl\|${PERL}\|g' ${WRKSRC}/ddclient	41	-e 's\|/usr.*perl\|${PERL}\|g' \
		42	-e 's\|/usr/local\|${LOCALBASE}\|g' \
		43	-e 's\|/etc/ddclient\|${PREFIX}/etc\|' \
		44	${WRKSRC}/ddclient
43		45
44	do-install:	46	do-install:
45	@${INSTALL_DATA} ${WRKSRC}/sample-etc_ddclient.conf ${PREFIX}/etc/ddclient.conf.sample	47	@${INSTALL_DATA} ${WRKSRC}/sample-etc_ddclient.conf ${PREFIX}/etc/ddclient.conf.sample

Added Link Here

(-)files/patch-ticket2 (+21 lines)
1	--- ddclient.orig 2011-03-11 00:00:19.394750047 -0800
2	+++ ddclient 2011-03-11 00:04:28.967751644 -0800
3	@@ -2094,10 +2094,14 @@
4	} elsif (defined($sub) && &$sub($host)) {
5	$update = 1;
6
7	- } elsif (($cache{$host}{'static'} ne $config{$host}{'static'}) \|\|
8	- ($cache{$host}{'wildcard'} ne $config{$host}{'wildcard'}) \|\|
9	- ($cache{$host}{'mx'} ne $config{$host}{'mx'}) \|\|
10	- ($cache{$host}{'backupmx'} ne $config{$host}{'backupmx'})) {
11	+ } elsif ((defined($cache{$host}{'static'}) && defined($config{$host}{'static'}) &&
12	+ ($cache{$host}{'static'} ne $config{$host}{'static'})) \|\|
13	+ (defined($cache{$host}{'wildcard'}) && defined($config{$host}{'wildcard'}) &&
14	+ ($cache{$host}{'wildcard'} ne $config{$host}{'wildcard'})) \|\|
15	+ (defined($cache{$host}{'mx'}) && defined($config{$host}{'mx'}) &&
16	+ ($cache{$host}{'mx'} ne $config{$host}{'mx'})) \|\|
17	+ (defined($cache{$host}{'backupmx'}) && defined($config{$host}{'backupmx'}) &&
18	+ ($cache{$host}{'backupmx'} ne $config{$host}{'backupmx'})) ) {
19	info("updating %s because host settings have been changed.", $host);
20	$update = 1;
21