Attachment #162195 for bug #193641




GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes

#LER: These pollute the environment, and break things.
#CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
#LDFLAGS+=	-L${LOCALBASE}/lib

OPTIONS_DEFINE?=	SQLITE3 MYSQL PGSQL MTX PYTHON NLS
OPTIONS_DEFAULT?=	NLS PGSQL

PYTHON_CONFIGURE_ON=	--with-python=yes

.if !defined(WITH_CLIENT_ONLY)
LIB_DEPENDS+=	libbac-${DISTVERSION}.so:${PORTSDIR}/sysutils/bacula-client
USE_RC_SUBR?=	bacula-dir bacula-sd
.endif


SUB_FILES+=	pkg-message.server
.endif

#LER: We use this instead of USES+= readline since the USES pollutes the LDFLAGS environment
.if !exists(/usr/lib/libreadline.so)
LIB_DEPENDS+=	libreadline.so.6:${PORTSDIR}/devel/readline
readline_ARGS=	/usr/local
.else
readline_ARGS=	yes
.endif

CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
		--enable-smartalloc \
		--sysconfdir=${ETCDIR} \
		--with-working-dir=${BACULA_DIR} \
		--with-scriptdir=${PREFIX}/share/${PORTNAME} \
		--with-readline=${readline_ARGS} \
		--disable-conio \
		--enable-batch-insert \
		--with-plugindir=${PREFIX}/lib \

SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
PGSQL_CONFIGURE_ON=	--with-postgresql=yes
#LER: This pollutes the environment, and the port uses pg_config
#PGSQL_USES=		pgsql

MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx



post-patch:
	# This port does not install docs.  See bacula-docs for that
	@${REINPLACE_CMD} -e 's@docdir@@' ${WRKSRC}/Makefile.in
	# Change $(ECHO) to echo in some Makefile.in files
	@${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g'  \
		${WRKSRC}/src/filed/Makefile.in   \

	@${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in
.else
	# In server port don't install filed
	#LER: This mucks up the build
	#@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
	#	-e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} \
		-e 's|../lib/[^[:space:]]*||g' \
		-e 's|../findlib/[^[:space:]]*||g' \




--- src/console/Makefile.in.orig	2015-08-13 13:52:24 UTC
+++ src/console/Makefile.in
@@ -48,12 +48,12 @@ all: Makefile bconsole @STATIC_CONS@
 
 
 bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
 	      $(OPENSSL_LIBS)
 
 static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
-	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) -L../lib -L../cats $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
 	      $(OPENSSL_LIBS)
 	strip $@
@@ -121,7 +121,7 @@ uninstall:
 depend:
 	@$(MV) Makefile Makefile.bak
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
-	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
+	@echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
 	@$(CXX) -S -M $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \

Return to bug 193641

Lines 28-35 Link Here

(-)sysutils/bacula-server/Makefile (-8 / +19 lines)
28	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
29	USE_LDCONFIG= yes	29	USE_LDCONFIG= yes
30		30
31	CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include	31	#LER: These pollute the environment, and break things.
32	LDFLAGS+= -L${LOCALBASE}/lib	32	#CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include
		33	#LDFLAGS+= -L${LOCALBASE}/lib
33		34
34	OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS	35	OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS
35	OPTIONS_DEFAULT?= NLS PGSQL	36	OPTIONS_DEFAULT?= NLS PGSQL
Lines 41-47 Link Here
41	PYTHON_CONFIGURE_ON= --with-python=yes	42	PYTHON_CONFIGURE_ON= --with-python=yes
42		43
43	.if !defined(WITH_CLIENT_ONLY)	44	.if !defined(WITH_CLIENT_ONLY)
44	LIB_DEPENDS+= libbac.so:${PORTSDIR}/sysutils/bacula-client	45	LIB_DEPENDS+= libbac-${DISTVERSION}.so:${PORTSDIR}/sysutils/bacula-client
45	USE_RC_SUBR?= bacula-dir bacula-sd	46	USE_RC_SUBR?= bacula-dir bacula-sd
46	.endif	47	.endif
47		48
Lines 51-62 Link Here
51	SUB_FILES+= pkg-message.server	52	SUB_FILES+= pkg-message.server
52	.endif	53	.endif
53		54
		55	#LER: We use this instead of USES+= readline since the USES pollutes the LDFLAGS environment
		56	.if !exists(/usr/lib/libreadline.so)
		57	LIB_DEPENDS+= libreadline.so.6:${PORTSDIR}/devel/readline
		58	readline_ARGS= /usr/local
		59	.else
		60	readline_ARGS= yes
		61	.endif
		62
54	CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \	63	CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
55	--enable-smartalloc \	64	--enable-smartalloc \
56	--sysconfdir=${ETCDIR} \	65	--sysconfdir=${ETCDIR} \
57	--with-working-dir=${BACULA_DIR} \	66	--with-working-dir=${BACULA_DIR} \
58	--with-scriptdir=${PREFIX}/share/${PORTNAME} \	67	--with-scriptdir=${PREFIX}/share/${PORTNAME} \
59	--with-readline=yes \	68	--with-readline=${readline_ARGS} \
60	--disable-conio \	69	--disable-conio \
61	--enable-batch-insert \	70	--enable-batch-insert \
62	--with-plugindir=${PREFIX}/lib \	71	--with-plugindir=${PREFIX}/lib \
Lines 115-121 Link Here
115	SQLITE3_CONFIGURE_ON= --with-sqlite3=yes	124	SQLITE3_CONFIGURE_ON= --with-sqlite3=yes
116	SQLITE3_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3	125	SQLITE3_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3
117	PGSQL_CONFIGURE_ON= --with-postgresql=yes	126	PGSQL_CONFIGURE_ON= --with-postgresql=yes
118	PGSQL_USES= pgsql	127	#LER: This pollutes the environment, and the port uses pg_config
		128	#PGSQL_USES= pgsql
119		129
120	MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx	130	MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
121		131
Lines 145-151 Link Here
145		155
146	post-patch:	156	post-patch:
147	# This port does not install docs. See bacula-docs for that	157	# This port does not install docs. See bacula-docs for that
148	@${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in	158	@${REINPLACE_CMD} -e 's@docdir@@' ${WRKSRC}/Makefile.in
149	# Change $(ECHO) to echo in some Makefile.in files	159	# Change $(ECHO) to echo in some Makefile.in files
150	@${REINPLACE_CMD} -e 's\|$$(ECHO)\|echo\|g' \	160	@${REINPLACE_CMD} -e 's\|$$(ECHO)\|echo\|g' \
151	${WRKSRC}/src/filed/Makefile.in \	161	${WRKSRC}/src/filed/Makefile.in \
Lines 165-172 Link Here
165	@${REINPLACE_CMD} -e 's\|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)\|#\1\|g' ${WRKSRC}/Makefile.in	175	@${REINPLACE_CMD} -e 's\|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)\|#\1\|g' ${WRKSRC}/Makefile.in
166	.else	176	.else
167	# In server port don't install filed	177	# In server port don't install filed
168	@${REINPLACE_CMD} -e '/^fd_subdirs = /s\|src/filed\|\|' -e 's\|src/console\|\|' \	178	#LER: This mucks up the build
169	-e 's\|src/lib\|\|' -e 's\|src/findlib\|\|' -e 's\|@FD_PLUGIN_DIR@\|\|' ${WRKSRC}/Makefile.in	179	#@${REINPLACE_CMD} -e '/^fd_subdirs = /s\|src/filed\|\|' -e 's\|src/console\|\|' \
		180	# -e 's\|src/lib\|\|' -e 's\|src/findlib\|\|' -e 's\|@FD_PLUGIN_DIR@\|\|' ${WRKSRC}/Makefile.in
170	@${REINPLACE_CMD} \	181	@${REINPLACE_CMD} \
171	-e 's\|../lib/[^[:space:]]*\|\|g' \	182	-e 's\|../lib/[^[:space:]]*\|\|g' \
172	-e 's\|../findlib/[^[:space:]]*\|\|g' \	183	-e 's\|../findlib/[^[:space:]]*\|\|g' \

Line 0 Link Here

(-)sysutils/bacula-server/files/patch-src_console_Makefile.in (+26 lines)
	1	--- src/console/Makefile.in.orig 2015-08-13 13:52:24 UTC
	2	+++ src/console/Makefile.in
	3	@@ -48,12 +48,12 @@ all: Makefile bconsole @STATIC_CONS@
	4
	5
	6	bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
	7	- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
	8	+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
	9	$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
	10	$(OPENSSL_LIBS)
	11
	12	static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
	13	- $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
	14	+ $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) -L../lib -L../cats $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
	15	$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
	16	$(OPENSSL_LIBS)
	17	strip $@
	18	@@ -121,7 +121,7 @@ uninstall:
	19	depend:
	20	@$(MV) Makefile Makefile.bak
	21	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
	22	- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
	23	+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
	24	@$(CXX) -S -M $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
	25	@if test -f Makefile ; then \
	26	$(RMF) Makefile.bak; \