FreeBSD Port: sarg-2.0.3
Peter Pentchev
roam at ringlet.net
Thu Feb 17 08:46:05 PST 2005
On Thu, Feb 17, 2005 at 02:44:28PM +0200, Maxim Tuliuk wrote:
> On Thu, Feb 17, 2005 at 11:57 +0200, Peter Pentchev wrote:
> > I've CC'd Maxim Tuliuk <mt at primats.org.ua>, the maintainer of the
> > www/sarg port; Maxim, what do you think about the attached patch, which
> > fixes the GD build by properly passing the necessary paths in the
> > correct way to the configure script? If you have no objections, I could
> > commit it.
>
> Where is the patch? Sorry, but I can see nothing :(
<impression mode="matrix">There <strong>is</strong> no patch ;)</impression>
Sorry, looks like I plain forgot to attach it :( Here it is.
G'luck,
Peter
--
Peter Pentchev roam at ringlet.net roam at cnsys.bg roam at FreeBSD.org
PGP key: http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint FDBA FD79 C26F 3C51 C95E DF9E ED18 B68D 1619 4553
You have, of course, just begun reading the sentence that you have just finished reading.
-------------- next part --------------
Index: ports/www/sarg/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/sarg/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- ports/www/sarg/Makefile 8 Feb 2005 17:27:36 -0000 1.11
+++ ports/www/sarg/Makefile 17 Feb 2005 09:24:41 -0000
@@ -19,10 +19,12 @@
.endif
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= CC=gcc --enable-bindir="${PREFIX}/bin" --enable-sysconfdir="${PREFIX}/etc/${PORTNAME}" --enable-htmldir=${PREFIX}/www/${PORTNAME}
+CONFIGURE_ENV= CC=${CC}
+CONFIGURE_ARGS= --enable-bindir="${PREFIX}/bin" --enable-sysconfdir="${PREFIX}/etc/${PORTNAME}" --enable-htmldir=${PREFIX}/www/${PORTNAME}
+USE_REINPLACE= yes
.if !defined(WITHOUT_GD)
-CFLAGS+= -I ${LOCALBASE}/include -L ${LOCALBASE}/lib
+CONFIGURE_ENV+= CPPFLAGS="-I ${LOCALBASE}/include" LDFLAGS="-L ${LOCALBASE}/lib"
.endif
MAN1= sarg.1
@@ -30,9 +32,9 @@
post-extract:
@${CHMOD} +x ${WRKSRC}/sarg-php/locale
-post-configure:
-.if !defined(WITHOUT_GD)
- @${SED} -i .orig 's|^\(LDFLAGS.*\)|\1 -I ${LOCALBASE}/include -L ${LOCALBASE}/lib|g' ${WRKSRC}/Makefile
-.endif
+post-patch:
+ ${REINPLACE_CMD} -e 's,^LDFLAGS="-g",LDFLAGS="$${LDFLAGS} -g",' ${WRKSRC}/configure
.include <bsd.port.mk>
+
+CONFIGURE_TARGET:= --build=${CONFIGURE_TARGET}
Index: ports/www/sarg/files/patch-Makefile.in
===================================================================
RCS file: /home/ncvs/ports/www/sarg/files/patch-Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile.in
--- ports/www/sarg/files/patch-Makefile.in 11 Aug 2003 14:43:40 -0000 1.2
+++ ports/www/sarg/files/patch-Makefile.in 17 Feb 2005 09:21:25 -0000
@@ -1,6 +1,14 @@
---- ./Makefile.in.orig Sat Apr 26 00:20:55 2003
-+++ ./Makefile.in Mon Aug 11 18:09:33 2003
-@@ -58,12 +58,11 @@
+--- Makefile.in.orig Wed Feb 2 18:36:57 2005
++++ Makefile.in Thu Feb 17 11:20:51 2005
+@@ -8,6 +8,7 @@
+ HTMLDIR = @HTMLDIR@
+ ISYSCONFDIR = -DSYSCONFDIR=\"@SYSCONFDIR@\"
+ IHTMLDIR = -DHTMLDIR=\"@HTMLDIR@\"
++CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+ DEFS = @DEFS@
+@@ -65,12 +66,11 @@
$(INSTALL_PROGRAM) sarg $(BINDIR)/sarg
chmod 755 $(BINDIR)/sarg
$(INSTALL_PROGRAM) sarg.1 $(MANDIR)/sarg.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20050217/984139cc/attachment.bin
More information about the freebsd-ports
mailing list