head	1.3;
access;
symbols
	RELEASE_8_3_0:1.3
	RELEASE_9_0_0:1.2
	RELEASE_7_4_0:1.1
	RELEASE_8_2_0:1.1
	RELEASE_6_EOL:1.1
	RELEASE_8_1_0:1.1
	RELEASE_7_3_0:1.1
	RELEASE_8_0_0:1.1
	RELEASE_7_2_0:1.1
	RELEASE_7_1_0:1.1
	RELEASE_6_4_0:1.1
	RELEASE_5_EOL:1.1
	RELEASE_7_0_0:1.1
	RELEASE_6_3_0:1.1
	PRE_XORG_7:1.1
	RELEASE_4_EOL:1.1
	RELEASE_6_2_0:1.1;
locks; strict;
comment	@# @;


1.3
date	2012.03.18.04.22.58;	author miwi;	state Exp;
branches;
next	1.2;

1.2
date	2011.11.03.08.14.02;	author vanilla;	state Exp;
branches;
next	1.1;

1.1
date	2006.07.15.08.55.42;	author clsung;	state Exp;
branches;
next	;


desc
@@


1.3
log
@- Update to 2.9.1
- Pass maintainership to submitter

PR:		165858
Submitted by:	Muhammad Moinur Rahman <5u623l20@@gmail.com>
Feature safe:	yes
@
text
@--- 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
 
@


1.2
log
@Fix build with clang.
@
text
@d1 3
a3 3
--- Makefile.orig	2006-07-11 16:25:55.000000000 +0800
+++ Makefile	2011-10-04 10:04:32.000000000 +0800
@@@@ -16,10 +16,11 @@@@ ifndef MANDIR
d13 1
a13 1
+RCDIR	   = $(ROOT)$(PREFIX)/etc
d15 3
a17 4
 #############################################################
 
@@@@ -27,7 +28,7 @@@@ RCDIR      = $(ROOT)/etc/rc.d/init.d
 # Add "-DHAVE_CRYPT" and "-lcrypt" to use crypt() function.
d19 1
d26 1
a26 1
@@@@ -58,7 +59,7 @@@@ BINGROUP = admin
d35 1
a35 12
@@@@ -80,8 +81,9 @@@@ mxml.o: $(MXMLDIR)/mxml.c $(MXMLDIR)/mxm
 strlcpy.o: $(MXMLDIR)/strlcpy.c $(MXMLDIR)/strlcpy.h
 	$(CC) $(CFLAGS) -c -o strlcpy.o $(MXMLDIR)/strlcpy.c
 
+#FIXME: Dont know why it dosent work with CFLAGS(gcc hangs up)
 elogd: src/elogd.c regex.o mxml.o strlcpy.o
-	$(CC) $(CFLAGS) -I$(MXMLDIR) -o elogd src/elogd.c regex.o mxml.o strlcpy.o $(LIBS)
+	$(CC) -I$(MXMLDIR) -o elogd src/elogd.c regex.o mxml.o strlcpy.o $(LIBS)
 
 debug: src/elogd.c regex.o mxml.o strlcpy.o
 	$(CC) -g -I$(MXMLDIR) -o elogd src/elogd.c regex.o mxml.o strlcpy.o $(LIBS)
@@@@ -113,7 +115,6 @@@@ update: $(EXECS)
d38 1
a38 1
 	@@$(INSTALL) -m 0755 -d $(ELOGDIR)/scripts/ $(ELOGDIR)/resources/ $(ELOGDIR)/themes/default/icons 
d40 2
a41 2
 	@@$(INSTALL) -v -m 0755 -o ${BINOWNER} -g ${BINGROUP} elog elconv $(DESTDIR)
 	@@$(INSTALL) -v -m 0755 -o ${BINOWNER} -g ${BINGROUP} elogd $(SDESTDIR)
d43 2
a44 6
@@@@ -128,23 +129,20 @@@@ install: $(EXECS)
 	@@$(INSTALL) -m 0644 themes/default/icons/* $(ELOGDIR)/themes/default/icons/
 	@@for file in `find themes/default -type f | grep -v .svn` ; \
           do \
-          $(INSTALL) -D -m 0644 $$file $(ELOGDIR)/themes/default/`basename $$file` ;\
+          $(INSTALL)  -C -m 0644 $$file $(ELOGDIR)/themes/default/`basename $$file` ;\
d52 2
a53 2
+		$(INSTALL) -v -d -m 0644 ${PREFIX}/$(LOGBOOKDIR)/demo ; \
+		$(INSTALL) -v -m 0644 logbooks/demo/* ${PREFIX}/$(LOGBOOKDIR)/demo ; \
d57 3
a59 1
-	@@$(INSTALL) -v -D -m 0755 elogd.init $(RCDIR)/elogd
d70 1
a70 1
 	-$(RM) *~ $(EXECS) regex.o mxml.o strlcpy.o locext
@


1.1
log
@Add elog , a fast and lightweight, extremly customizable weblog.

PR:		ports/100214
Submitted by:	David Otto <ottodavid at gmx.net>
@
text
@d1 3
a3 3
--- Makefile.orig	Sun Jul  9 16:26:32 2006
+++ Makefile	Tue Jul 11 20:03:40 2006
@@@@ -16,10 +16,11 @@@@
d17 19
a35 1
@@@@ -80,8 +81,9 @@@@
d46 1
a46 1
@@@@ -106,7 +108,6 @@@@
d54 1
a54 1
@@@@ -121,23 +122,20 @@@@
@

