--- Makefile.orig	2012-03-08 01:06:37.350243657 +0600
+++ Makefile	2012-03-08 01:18:10.119237761 +0600
@@ -16,10 +16,11 @@
 MANDIR     = $(ROOT)$(PREFIX)/man
 endif
 
-ELOGDIR    = $(ROOT)$(PREFIX)/elog
+#LOGBOOKDIR is set by the Ports Makefile
+ELOGDIR    = $(ROOT)$(PREFIX)/share/elog
 DESTDIR    = $(ROOT)$(PREFIX)/bin
 SDESTDIR   = $(ROOT)$(PREFIX)/sbin
-RCDIR      = $(ROOT)/etc/rc.d/init.d
+RCDIR     = $(ROOT)$(PREFIX)/etc
 
 # flag for SSL support
 USE_SSL    = 1
@@ -33,7 +34,7 @@
 CFLAGS += -O3 -funroll-loops -fomit-frame-pointer -W -Wall
 #CFLAGS += -g -funroll-loops -fomit-frame-pointer -W -Wall
 
-CC = gcc
+CC ?= gcc
 IFLAGS = -kr -nut -i3 -l110
 EXECS = elog elogd elconv
 MXMLDIR = ../mxml
@@ -68,7 +69,7 @@
 endif
 
 ifeq ($(OSTYPE),FreeBSD)
-CC = gcc
+CC ?= gcc
 BINOWNER = root
 BINGROUP = wheel
 endif
@@ -153,7 +154,6 @@
 install: $(EXECS)
 	@$(INSTALL) -m 0755 -d $(DESTDIR) $(SDESTDIR) $(MANDIR)/man1/ $(MANDIR)/man8/
 	@$(INSTALL) -m 0755 -d $(ELOGDIR)/scripts/ $(ELOGDIR)/resources/ $(ELOGDIR)/ssl/ $(ELOGDIR)/themes/default/icons 
-	@$(INSTALL) -m 0755 -d $(ELOGDIR)/logbooks/demo
 	@$(INSTALL) -v -m 0755 ${BINFLAGS} elog elconv $(DESTDIR)
 	@$(INSTALL) -v -m 0755 ${BINFLAGS} elogd $(SDESTDIR)
 	@$(INSTALL) -v -m 0644 man/elog.1 man/elconv.1 $(MANDIR)/man1/
@@ -178,21 +178,19 @@
           $(INSTALL) -m 0644 $$file $(ELOGDIR)/themes/default/`basename $$file` ;\
           done
 
-	@echo "Installing example logbook to $(ELOGDIR)/logbooks/demo"	
-	@if [ ! -f $(ELOGDIR)/logbooks/demo ]; then  \
-	  $(INSTALL) -v -m 0644 logbooks/demo/* $(ELOGDIR)/logbooks/demo ; \
+	@echo "Installing example logbook to $(LOGBOOKDIR)/demo"
+	@if [ ! -f ${PREFIX}/$(LOGBOOKDIR)/demo ]; then \
+          $(INSTALL) -v -d -m 0644 ${PREFIX}/$(LOGBOOKDIR)/demo ; \
+          $(INSTALL) -v -m 0644 logbooks/demo/* ${PREFIX}/$(LOGBOOKDIR)/demo ; \
 	fi
 
-	@sed "s#\@PREFIX\@#$(PREFIX)#g" elogd.init_template > elogd.init
+
 	@mkdir -p -m 0755 $(RCDIR)
-	@$(INSTALL) -v -m 0755 elogd.init $(RCDIR)/elogd
 
-	@if [ ! -f $(ELOGDIR)/elogd.cfg ]; then  \
-	  $(INSTALL) -v -m 644 elogd.cfg $(ELOGDIR)/elogd.cfg ; \
+	@if [ ! -f $(RCDIR)/elogd.cfg.sample ]; then  \
+	  $(INSTALL) -v -m 644 elogd.cfg $(RCDIR)/elogd.cfg.sample ; \
 	fi
 
-restart:
-	$(RCDIR)/elogd restart
 clean:
 	-$(RM) *~ $(EXECS) regex.o crypt.o auth.o mxml.o strlcpy.o locext
 
