aboutsummaryrefslogtreecommitdiffstats
path: root/graphics/jpeg
diff options
context:
space:
mode:
authorade <ade@FreeBSD.org>2006-02-23 18:40:44 +0800
committerade <ade@FreeBSD.org>2006-02-23 18:40:44 +0800
commitda880765886f48c0ac8fd253e5601d04ea853215 (patch)
tree55155f50e8a40ea2e2a16e2331e8cbb919b7d04f /graphics/jpeg
parentba4beb1ea11e6147a9b30969be42685d1c709e56 (diff)
downloadfreebsd-ports-gnome-da880765886f48c0ac8fd253e5601d04ea853215.tar.gz
freebsd-ports-gnome-da880765886f48c0ac8fd253e5601d04ea853215.tar.zst
freebsd-ports-gnome-da880765886f48c0ac8fd253e5601d04ea853215.zip
Conversion to a single libtool environment.
Approved by: portmgr (kris)
Diffstat (limited to 'graphics/jpeg')
-rw-r--r--graphics/jpeg/Makefile3
-rw-r--r--graphics/jpeg/files/patch-configure20
-rw-r--r--graphics/jpeg/pkg-plist1
3 files changed, 10 insertions, 14 deletions
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 3dda0d190a6c..aa779262fdea 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -9,7 +9,7 @@
PORTNAME= jpeg
PORTVERSION= 6b
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.ijg.org/files/ \
ftp://ftp.uu.net/graphics/jpeg/ \
@@ -40,7 +40,6 @@ MAN1= cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
post-extract:
@${CP} ${DISTDIR}/jpegexiforient.c ${WRKSRC}/
@${CP} ${DISTDIR}/exifautotran.txt ${WRKSRC}/exifautotran
- @${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
post-build:
@cd ${WRKSRC} && ${CC} ${CFLAGS} -o jpegexiforient jpegexiforient.c
diff --git a/graphics/jpeg/files/patch-configure b/graphics/jpeg/files/patch-configure
index 85392d80c6ae..c12ab1b2ff49 100644
--- a/graphics/jpeg/files/patch-configure
+++ b/graphics/jpeg/files/patch-configure
@@ -1,21 +1,17 @@
---- configure.orig Sat Mar 21 14:08:57 1998
-+++ configure Mon Aug 4 21:49:44 2003
-@@ -1559,7 +1559,8 @@
- if test "x$LTSTATIC" = xno; then
- disable_static="--disable-static"
+--- configure.orig Sat Mar 21 19:08:57 1998
++++ configure Sat Jan 21 09:22:46 2006
+@@ -1531,3 +1531,2 @@
+ USELIBTOOL="yes"
+- LIBTOOL="./libtool"
+ O="lo"
+@@ -1561,3 +1560,4 @@
fi
- $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh
+ pic_flag="-fPIC"
+ $ac_aux_dir/ltconfig $disable_shared $disable_static $ac_aux_dir/ltmain.sh
fi
-
- # Select memory manager depending on user input.
-@@ -1647,7 +1648,7 @@
- # Extract the library version ID from jpeglib.h.
- echo $ac_n "checking libjpeg version number""... $ac_c" 1>&6
+@@ -1649,3 +1649,3 @@
echo "configure:1650: checking libjpeg version number" >&5
-JPEG_LIB_VERSION=`sed -e '/^#define JPEG_LIB_VERSION/!d' -e 's/^[^0-9]*\([0-9][0-9]*\).*$/\1/' $srcdir/jpeglib.h`
+JPEG_LIB_VERSION=9
echo "$ac_t""$JPEG_LIB_VERSION" 1>&6
-
-
diff --git a/graphics/jpeg/pkg-plist b/graphics/jpeg/pkg-plist
index 2f19a75c6825..4c0624175e5a 100644
--- a/graphics/jpeg/pkg-plist
+++ b/graphics/jpeg/pkg-plist
@@ -12,6 +12,7 @@ include/jmorecfg.h
include/jpegint.h
include/jpeglib.h
lib/libjpeg.a
+lib/libjpeg.la
lib/libjpeg.so
lib/libjpeg.so.9
%%PORTDOCS%%%%DOCSDIR%%/README