--- Config.orig 2010-07-29 10:19:04.982393002 +0200 +++ Config 2010-07-29 10:21:55.459770746 +0200 @@ -28,31 +28,31 @@ ############################################################################ # Location of compiler -CC = gcc +#CC = gcc # Location of make program (GNU make required) MAKE = gmake # Location of install program (GNU install or compatible required) INSTALL = install # Base Compiler options for GCC (use CPPFLAGS and LDFLAGS if passed in) -ifdef CPPFLAGS - BASECFLAGS = $(CPPFLAGS) +ifdef PORTCFLAGS + BASECFLAGS = $(PORTCFLAGS) else BASECFLAGS = -Wall -g -O2 endif ifdef INCLUDES BASECFLAGS += $(INCLUDES) endif -ifdef LDFLAGS - BASELDFLAGS = $(LDFLAGS) +ifdef PORTLDFLAGS + BASELDFLAGS = $(PORTLDFLAGS) else BASELDFLAGS = -g endif # Minimal libraries needed by Linux -BASE_LIBS = -lcrypt -lutil +#BASE_LIBS = -lcrypt -lutil # FreeBSD needs some extra libraries: -# BASE_LIBS = -lcrypt -liconv -lutil +BASE_LIBS = -lcrypt -liconv -lutil # Solaris needs even more libararies: # BASE_LIBS = -lcrypt -lxnet -lnsl -lsocket @@ -93,12 +93,14 @@ # Following works with the mail/cclient port from FreeBSD # #CCLIENT_INCLUDE = -I/usr/local/include/c-client +CCLIENT_INCLUDE = -I${LOCALBASE}/include/c-client #CCLIENT_LIBS = -L/usr/local/lib -lc-client4 +CCLIENT_LIBS = -L${LOCALBASE}/lib -lc-client4 # # Complication: # The FreeBSD port uses PAM and optionally SSL if built WITH_SSL=yes. # -#CCLIENT_SSL_ENABLE = true +CCLIENT_SSL_ENABLE = true #CCLIENT_KERB_ENABLE = true ############################################################################ @@ -116,7 +118,7 @@ Z_LIBS = -lz # LDAP (required if LDAP_ENABLE set) -LDAP_INCLUDE = +LDAP_INCLUDE = -I${LOCALBASE}/include LDAP_LIBS = -lldap # Pam (required if CCLIENT_PAM_ENABLE set) @@ -171,7 +173,7 @@ # Default configuration and permissions does not allow prayer user to # update prayer configuration file. -PREFIX = /usr/local/prayer +PREFIX = %%PREFIX%%/prayer RO_USER = root RO_GROUP = prayer @@ -186,6 +188,6 @@ PRIVATE_FILE = 0640 # Location of configuration files and binaries -PRAYER_CONFIG_FILE = ${PREFIX}/etc/prayer.cf -BIN_DIR = ${PREFIX}/sbin -ACCOUNTD_CONFIG_FILE = ${PREFIX}/etc/prayer-accountd.cf +PRAYER_CONFIG_FILE = %%PREFIX%%/etc/prayer/prayer.cf +BIN_DIR = %%PREFIX%%/sbin +ACCOUNTD_CONFIG_FILE = %%PREFIX%%/etc/prayer/accountd.cf