Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Feb 2005 18:46:00 +0200
From:      Peter Pentchev <roam@ringlet.net>
To:        Maxim Tuliuk <mt@primats.org.ua>
Cc:        bg <bg@donbass.aero>
Subject:   Re: FreeBSD Port: sarg-2.0.3
Message-ID:  <20050217164600.GQ815@straylight.m.ringlet.net>
In-Reply-To: <20050217124428.GA5993@top.net.ua>
References:  <000501c50f53$3d1bee30$1401020a@admin> <20050217095724.GC1161@straylight.m.ringlet.net> <20050217124428.GA5993@top.net.ua>

next in thread | previous in thread | raw e-mail | index | archive | help

--7VkxxUl3xUvPtoxk
Content-Type: multipart/mixed; boundary="j3zO+32zXj6UcJCE"
Content-Disposition: inline


--j3zO+32zXj6UcJCE
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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@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.
>=20
> Where is the patch? Sorry, but I can see nothing :(

<impression mode=3D"matrix">There <strong>is</strong> no patch ;)</impressi=
on>

Sorry, looks like I plain forgot to attach it :(  Here it is.

G'luck,
Peter

--=20
Peter Pentchev	roam@ringlet.net    roam@cnsys.bg    roam@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 fin=
ished reading.

--j3zO+32zXj6UcJCE
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="sarg-gd.patch"
Content-Transfer-Encoding: quoted-printable

Index: ports/www/sarg/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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
=20
 GNU_CONFIGURE=3D	yes
-CONFIGURE_ARGS=3D	CC=3Dgcc --enable-bindir=3D"${PREFIX}/bin" --enable-sysc=
onfdir=3D"${PREFIX}/etc/${PORTNAME}" --enable-htmldir=3D${PREFIX}/www/${POR=
TNAME}
+CONFIGURE_ENV=3D	CC=3D${CC}
+CONFIGURE_ARGS=3D	--enable-bindir=3D"${PREFIX}/bin" --enable-sysconfdir=3D=
"${PREFIX}/etc/${PORTNAME}" --enable-htmldir=3D${PREFIX}/www/${PORTNAME}
+USE_REINPLACE=3D	yes
=20
 .if !defined(WITHOUT_GD)
-CFLAGS+=3D	-I ${LOCALBASE}/include -L ${LOCALBASE}/lib
+CONFIGURE_ENV+=3D	CPPFLAGS=3D"-I ${LOCALBASE}/include" LDFLAGS=3D"-L ${LOC=
ALBASE}/lib"
 .endif
=20
 MAN1=3D		sarg.1
@@ -30,9 +32,9 @@
 post-extract:
 	@${CHMOD} +x ${WRKSRC}/sarg-php/locale
=20
-post-configure:
-.if !defined(WITHOUT_GD)
-	@${SED} -i .orig 's|^\(LDFLAGS.*\)|\1 -I ${LOCALBASE}/include -L ${LOCALB=
ASE}/lib|g' ${WRKSRC}/Makefile
-.endif
+post-patch:
+	${REINPLACE_CMD} -e 's,^LDFLAGS=3D"-g",LDFLAGS=3D"$${LDFLAGS} -g",' ${WRK=
SRC}/configure
=20
 .include <bsd.port.mk>
+
+CONFIGURE_TARGET:=3D	--build=3D${CONFIGURE_TARGET}
Index: ports/www/sarg/files/patch-Makefile.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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		=3D @HTMLDIR@
+ ISYSCONFDIR	=3D -DSYSCONFDIR=3D\"@SYSCONFDIR@\"
+ IHTMLDIR	=3D -DHTMLDIR=3D\"@HTMLDIR@\"
++CPPFLAGS	=3D @CPPFLAGS@
+ CFLAGS 		=3D @CFLAGS@
+ LDFLAGS 	=3D @LDFLAGS@
+ DEFS            =3D @DEFS@=20
+@@ -65,12 +66,11 @@
  	$(INSTALL_PROGRAM) sarg $(BINDIR)/sarg
  	chmod 755 $(BINDIR)/sarg
  	$(INSTALL_PROGRAM) sarg.1 $(MANDIR)/sarg.1

--j3zO+32zXj6UcJCE--

--7VkxxUl3xUvPtoxk
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (FreeBSD)

iD8DBQFCFMpI7Ri2jRYZRVMRAhKOAJwOIjZ8DFHtBEQg/N5oZ0tArNynjgCdEM/b
d6tejGokj6J3+SQMaTxA3BM=
=Gmp6
-----END PGP SIGNATURE-----

--7VkxxUl3xUvPtoxk--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050217164600.GQ815>