From ea0581a2a08010bc19c0b0404c2ae2a0bee93fb2 Mon Sep 17 00:00:00 2001 From: Sergey Matveychuk Date: Mon, 14 Feb 2005 13:55:47 +0000 Subject: [PATCH] - look for conf file in ${PREFIX}/etc/ and not in fixed locations out of ${HOME} or ${PREFIX} PR: ports/71916 Submitted by: Jose M Rodriguez --- www/plugger/files/patch-Makefile.in | 13 +++++++++++-- www/plugger/files/patch-plugger.c | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 www/plugger/files/patch-plugger.c diff --git a/www/plugger/files/patch-Makefile.in b/www/plugger/files/patch-Makefile.in index a59f503195e9..0d7422fefb80 100644 --- a/www/plugger/files/patch-Makefile.in +++ b/www/plugger/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Wed Jul 7 03:13:00 2004 -+++ Makefile.in Wed Jul 7 03:21:47 2004 +--- Makefile.in.orig Sun May 16 01:02:46 2004 ++++ Makefile.in Fri Sep 10 15:03:17 2004 @@ -30,7 +30,7 @@ CC=@CC@ LD=@LD@ @@ -27,3 +27,12 @@ all: plugger.so plugger-$(VERSION) plugger-controller +@@ -132,7 +132,7 @@ + plugger-helper.o: plugger.h + + plugger.o: plugger.c plugger.h +- $(CC) -c $(SHARED_CFLAGS) -o plugger.o plugger.c ++ $(CC) -c $(SHARED_CFLAGS) -DSYSCONFDIR=\"$(prefix)/etc\" -o plugger.o plugger.c + + plugger-common.o: plugger-common.c plugger.h + $(CC) -c $(SHARED_CFLAGS) -o plugger-common.o plugger-common.c diff --git a/www/plugger/files/patch-plugger.c b/www/plugger/files/patch-plugger.c new file mode 100644 index 000000000000..3bd90e6c9c05 --- /dev/null +++ b/www/plugger/files/patch-plugger.c @@ -0,0 +1,19 @@ +--- plugger.c.orig Fri Sep 10 14:42:03 2004 ++++ plugger.c Fri Sep 10 15:00:52 2004 +@@ -624,16 +624,6 @@ + if(cb(fname, data)) return 1; + #endif + +- sprintf(fname,"/usr/local/netscape/%s",basename); +- if(cb(fname, data)) return 1; +- sprintf(fname,"/etc/%s",basename); +- if(cb(fname, data)) return 1; +- sprintf(fname,"/usr/etc/%s",basename); +- if(cb(fname, data)) return 1; +- sprintf(fname,"/usr/local/etc/%s",basename); +- if(cb(fname, data)) return 1; +- if(cb(basename, data)) return 1; +- + return 0; + } +