Compile against newest libpng

6 files changed, 111 insertions, 105 deletions

diff --git a/app-admin/modlogan/ChangeLog b/app-admin/modlogan/ChangeLog
index 44fe91bfc304..f6ee909e8c05 100644
--- a/app-admin/modlogan/ChangeLog
+++ b/app-admin/modlogan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/modlogan
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/ChangeLog,v 1.1 2002/02/01 21:52:59 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/ChangeLog,v 1.2 2002/04/12 22:30:07 seemant Exp $
+
+*modlogan-0.7.4-r1 (12 Apr 2002)
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> modlogan-0.7.4-r1.ebuild :
+
+  Compile against new libpng
 
 *modlogan-0.7.4 (1 Feb 2002)
 
diff --git a/app-admin/modlogan/files/digest-modlogan-0.5.7-r1 b/app-admin/modlogan/files/digest-modlogan-0.5.7-r1
deleted file mode 100644
index 1aa70497fcd0..000000000000
--- a/app-admin/modlogan/files/digest-modlogan-0.5.7-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 dedfa640e1229c5c2bffd61102e105b5 modlogan-0.5.7.tar.gz 431407
-MD5 46768d1d4af9f3f503f7f32ac4127c7a gd-1.8.1.tar.gz 260967
diff --git a/app-admin/modlogan/files/digest-modlogan-0.7.4-r1 b/app-admin/modlogan/files/digest-modlogan-0.7.4-r1
new file mode 100644
index 000000000000..30175aa638f8
--- /dev/null
+++ b/app-admin/modlogan/files/digest-modlogan-0.7.4-r1
@@ -0,0 +1,2 @@
+MD5 74d481b225a45bf7e1a3816ffa987395 modlogan-0.7.4.tar.gz 885444
+MD5 46768d1d4af9f3f503f7f32ac4127c7a gd-1.8.1.tar.gz 260967
diff --git a/app-admin/modlogan/files/digest-modlogan-0.7.7 b/app-admin/modlogan/files/digest-modlogan-0.7.7
deleted file mode 100644
index 9193c2add4a9..000000000000
--- a/app-admin/modlogan/files/digest-modlogan-0.7.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 46768d1d4af9f3f503f7f32ac4127c7a gd-1.8.1.tar.gz 262144
-MD5 84c5b6a9ffe712fe18ce5836cd1c1f8d modlogan-0.7.7.tar.gz 917504
diff --git a/app-admin/modlogan/modlogan-0.5.7-r1.ebuild b/app-admin/modlogan/modlogan-0.5.7-r1.ebuild
deleted file mode 100644
index fb5b83fa5a69..000000000000
--- a/app-admin/modlogan/modlogan-0.5.7-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.5.7-r1.ebuild,v 1.4 2001/11/10 02:30:19 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Logfile Analyzer"
-SRC_URI="http://www.kneschke.de/projekte/modlogan/download/${P}.tar.gz
-	 http://www.kneschke.de/projekte/modlogan/download/gd-1.8.1.tar.gz"
-
-DEPEND="virtual/glibc virtual/x11
-	=media-libs/freetype-1.3.1-r2
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.7
-	>=dev-libs/libpcre-3.2
-	mysql? ( >=dev-db/mysql-3.23.26 )
-    nls? ( sys-devel/gettext )
-	"
-RDEPEND="virtual/glibc virtual/x11
-	=media-libs/freetype-1.3.1-r2
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.7
-	>=dev-libs/libpcre-3.2
-	"
-
-src_compile() {
-  cd ${S}/../gd-1.8.1
-  CFLAGS="$CFLAGS -I/usr/include/freetype" try ./configure
-  try make
-  cp .libs/libgd.so.0.0.0 libgd.so.0.0.0
-  ln -s libgd.so.0.0.0 libgd.so
-
-  local myconf
-  if [ "`use mysql`" ]
-  then
-     myconf="--with-mysql=/usr"
-  else
-     myconf="--without-mysql"
-  fi
-  if [ -z "`use nls`" ]
-  then
-      myconf="$myconf --disable-nls"
-  fi
-
-  cd ${S}
-  try ./configure --host=${CHOST} --prefix=/usr \
-        --sysconfdir=/etc/modlogan --enable-plugins \
-	--libdir=/usr/lib/modlogan --mandir=/usr/share/man \
-	--with-gd=${WORKDIR}/gd-1.8.1/ \
-	--disable-check-dynamic ${myconf}
-  try make
-}
-
-src_install() {                               
-  cd ${S}/../gd-1.8.1
-  into /usr
-  dolib libgd.so.0.0.0
-  cd ${S}
-  try make prefix=${D}/usr sysconfdir=${D}/etc/modlogan \
-	   libdir=${D}/usr/lib/modlogan mandir=${D}/usr/share/man install
-  insinto /etc/modlogan
-  newins ${FILESDIR}/sample.conf modlogan.conf.sample
-  newins ${FILESDIR}/sample.def.conf modlogan.def.conf.sample
-  doins doc/modlogan.searchengines
-  insinto /etc/httpd
-  newins ${FILESDIR}/modlogan.conf httpd.modlogan
-  dodir /usr/local/httpd/modlogan
-  preplib /usr
-  dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-  dodoc doc/*.txt doc/*.conf doc/glosar doc/stats
-  docinto html
-  dodoc doc/*.html
-}
-
-pkg_postinst() {
-
-  if [ ! -a ${ROOT}etc/modlogan/modlogan.conf ]
-  then
-    cd ${ROOT}/etc/modlogan
-    sed -e "s:##HOST##:${HOSTNAME}:g" \
-	-e "s:##HOST2##:${HOSTNAME/./\\.}:g" \
-    modlogan.conf.sample > modlogan.conf
-    rm modlogan.conf.sample
- fi
-
-  if [ ! -a ${ROOT}etc/modlogan/modlogan.def.conf ]
-  then
-    cd ${ROOT}/etc/modlogan
-    sed -e "s:##HOST##:${HOSTNAME}:g" \
-	-e "s:##HOST2##:${HOSTNAME/./\\.}:g" \
-    modlogan.def.conf.sample > modlogan.def.conf
-    rm modlogan.def.conf.sample
- fi
-
-}
-
-
-
-
-
diff --git a/app-admin/modlogan/modlogan-0.7.4-r1.ebuild b/app-admin/modlogan/modlogan-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..368badb0f8af
--- /dev/null
+++ b/app-admin/modlogan/modlogan-0.7.4-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.7.4-r1.ebuild,v 1.1 2002/04/12 22:30:07 seemant Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Logfile Analyzer"
+SRC_URI="http://www.kneschke.de/projekte/modlogan/download/${P}.tar.gz
+	 http://www.kneschke.de/projekte/modlogan/download/gd-1.8.1.tar.gz"
+
+DEPEND="virtual/x11
+	~media-libs/freetype-1.3
+	>=media-libs/jpeg-6b
+	media-libs/libpng
+	>=dev-libs/libpcre-3.2
+	>=net-libs/adns-1.0
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	"
+RDEPEND="${DEPEND}
+    nls? ( sys-devel/gettext )
+	"
+
+src_compile() {
+	cd ${S}/../gd-1.8.1
+	export CFLAGS="$CFLAGS -I/usr/include/freetype" 
+
+	./configure || die
+	make || die
+
+	cp .libs/libgd.so.0.0.0 libgd.so.0.0.0
+	ln -s libgd.so.0.0.0 libgd.so
+
+	local myconf
+	use mysql	\
+		 && myconf="--with-mysql=/usr"	\
+		 || myconf="--without-mysql"
+	
+	use nls	\
+		|| myconf="$myconf --disable-nls"
+
+cd ${S}
+	./configure 	\
+		--host=${CHOST}	\
+		--prefix=/usr \
+		--enable-plugins \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/modlogan	\
+		--libdir=/usr/lib/modlogan	\
+		--with-gd=${WORKDIR}/gd-1.8.1/ \
+		--disable-check-dynamic	\
+		${myconf} || die
+
+	make || die
+}
+
+src_install() {                               
+	cd ${S}/../gd-1.8.1
+	into /usr
+	dolib libgd.so.0.0.0
+	cd ${S}
+	make 	\
+		prefix=${D}/usr	\
+		mandir=${D}/usr/share/man	\
+		sysconfdir=${D}/etc/modlogan \
+		libdir=${D}/usr/lib/modlogan 	\
+		install || die
+
+	insinto /etc/modlogan
+	newins ${FILESDIR}/sample.conf modlogan.conf.sample
+	newins ${FILESDIR}/sample.def.conf modlogan.def.conf.sample
+	doins doc/modlogan.searchengines
+	insinto /etc/httpd
+	newins ${FILESDIR}/modlogan.conf httpd.modlogan
+	dodir /usr/local/httpd/modlogan
+	preplib /usr
+	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
+	dodoc doc/*.txt doc/*.conf doc/glosar doc/stats
+	docinto html
+	dodoc doc/*.html
+}
+
+pkg_postinst() {
+
+	if [ ! -a ${ROOT}etc/modlogan/modlogan.conf ]
+	then
+		cd ${ROOT}/etc/modlogan
+		sed -e "s:##HOST##:${HOSTNAME}:g" \
+			-e "s:##HOST2##:${HOSTNAME/./\\.}:g" \
+		modlogan.conf.sample > modlogan.conf
+		rm modlogan.conf.sample
+	fi
+
+	if [ ! -a ${ROOT}etc/modlogan/modlogan.def.conf ]
+	then
+		cd ${ROOT}/etc/modlogan
+		sed -e "s:##HOST##:${HOSTNAME}:g" \
+			-e "s:##HOST2##:${HOSTNAME/./\\.}:g" \
+		modlogan.def.conf.sample > modlogan.def.conf
+		rm modlogan.def.conf.sample
+	fi
+
+}