diff options
| author | Jeremy Lea <reg@FreeBSD.org> | 2000-10-03 00:54:04 +0000 |
|---|---|---|
| committer | Jeremy Lea <reg@FreeBSD.org> | 2000-10-03 00:54:04 +0000 |
| commit | 949601261bde334b690b6f1b9330e034738be810 (patch) | |
| tree | ee5087b07ed6edc20b9823d389779e4eebf4e1ab /graphics | |
| parent | Correct and sort PLISTs. (diff) | |
Correct USE_LIBTOOL usage.
Notes
Notes:
svn path=/head/; revision=33339
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/jpeg-mmx/Makefile | 5 | ||||
| -rw-r--r-- | graphics/jpeg-mmx/files/patch-ab | 24 | ||||
| -rw-r--r-- | graphics/jpeg-mmx/pkg-plist | 15 | ||||
| -rw-r--r-- | graphics/jpeg/Makefile | 5 | ||||
| -rw-r--r-- | graphics/jpeg/files/patch-ab | 24 | ||||
| -rw-r--r-- | graphics/jpeg/pkg-plist | 15 |
6 files changed, 42 insertions, 46 deletions
diff --git a/graphics/jpeg-mmx/Makefile b/graphics/jpeg-mmx/Makefile index b72f77a33b27..6997d9f42264 100644 --- a/graphics/jpeg-mmx/Makefile +++ b/graphics/jpeg-mmx/Makefile @@ -16,11 +16,12 @@ DISTNAME= jpegsrc.v${PORTVERSION} MAINTAINER= jseger@FreeBSD.org WRKSRC= ${WRKDIR}/jpeg-6b + +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared --enable-static -CONFIGURE_ENV= LIBTOOL=${LIBTOOL} + MAN1= cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1 -USE_LIBTOOL= yes post-install: .if !defined(NOPORTDOCS) diff --git a/graphics/jpeg-mmx/files/patch-ab b/graphics/jpeg-mmx/files/patch-ab index e4de71cf3d30..9b9920832ffe 100644 --- a/graphics/jpeg-mmx/files/patch-ab +++ b/graphics/jpeg-mmx/files/patch-ab @@ -1,17 +1,15 @@ ---- configure.orig Sat Mar 21 14:08:57 1998 -+++ configure Sat Jul 29 23:23:09 2000 -@@ -1529,7 +1529,9 @@ +--- configure.orig Sat Mar 21 11:08:57 1998 ++++ configure Thu Aug 31 01:07:10 2000 +@@ -1559,7 +1559,7 @@ + if test "x$LTSTATIC" = xno; then + disable_static="--disable-static" + fi +- $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh ++ $ac_aux_dir/ltconfig $disable_shared $disable_static $ac_aux_dir/ltmain.sh + fi - if test "x$LTSHARED" != xno -o "x$LTSTATIC" != xno; then - USELIBTOOL="yes" -- LIBTOOL="./libtool" -+ if test "x$LIBTOOL" = "x"; then -+ LIBTOOL="./libtool" -+ fi - O="lo" - A="la" - LN='$(LIBTOOL) --mode=link $(CC)' -@@ -1647,7 +1649,7 @@ + # Select memory manager depending on user input. +@@ -1647,7 +1647,7 @@ # Extract the library version ID from jpeglib.h. echo $ac_n "checking libjpeg version number""... $ac_c" 1>&6 echo "configure:1650: checking libjpeg version number" >&5 diff --git a/graphics/jpeg-mmx/pkg-plist b/graphics/jpeg-mmx/pkg-plist index 558fd8902e1c..1b79cfeab6dd 100644 --- a/graphics/jpeg-mmx/pkg-plist +++ b/graphics/jpeg-mmx/pkg-plist @@ -3,6 +3,13 @@ bin/djpeg bin/jpegtran bin/rdjpgcom bin/wrjpgcom +include/jconfig.h +include/jerror.h +include/jmorecfg.h +include/jpeglib.h +lib/libjpeg.a +lib/libjpeg.so +lib/libjpeg.so.9 share/doc/jpeg/README share/doc/jpeg/coderules.doc share/doc/jpeg/filelist.doc @@ -12,12 +19,4 @@ share/doc/jpeg/libjpeg.doc share/doc/jpeg/structure.doc share/doc/jpeg/usage.doc share/doc/jpeg/wizard.doc -include/jconfig.h -include/jerror.h -include/jmorecfg.h -include/jpeglib.h -lib/libjpeg.a -lib/libjpeg.la -lib/libjpeg.so -lib/libjpeg.so.9 @dirrm share/doc/jpeg diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile index b72f77a33b27..6997d9f42264 100644 --- a/graphics/jpeg/Makefile +++ b/graphics/jpeg/Makefile @@ -16,11 +16,12 @@ DISTNAME= jpegsrc.v${PORTVERSION} MAINTAINER= jseger@FreeBSD.org WRKSRC= ${WRKDIR}/jpeg-6b + +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared --enable-static -CONFIGURE_ENV= LIBTOOL=${LIBTOOL} + MAN1= cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1 -USE_LIBTOOL= yes post-install: .if !defined(NOPORTDOCS) diff --git a/graphics/jpeg/files/patch-ab b/graphics/jpeg/files/patch-ab index e4de71cf3d30..9b9920832ffe 100644 --- a/graphics/jpeg/files/patch-ab +++ b/graphics/jpeg/files/patch-ab @@ -1,17 +1,15 @@ ---- configure.orig Sat Mar 21 14:08:57 1998 -+++ configure Sat Jul 29 23:23:09 2000 -@@ -1529,7 +1529,9 @@ +--- configure.orig Sat Mar 21 11:08:57 1998 ++++ configure Thu Aug 31 01:07:10 2000 +@@ -1559,7 +1559,7 @@ + if test "x$LTSTATIC" = xno; then + disable_static="--disable-static" + fi +- $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh ++ $ac_aux_dir/ltconfig $disable_shared $disable_static $ac_aux_dir/ltmain.sh + fi - if test "x$LTSHARED" != xno -o "x$LTSTATIC" != xno; then - USELIBTOOL="yes" -- LIBTOOL="./libtool" -+ if test "x$LIBTOOL" = "x"; then -+ LIBTOOL="./libtool" -+ fi - O="lo" - A="la" - LN='$(LIBTOOL) --mode=link $(CC)' -@@ -1647,7 +1649,7 @@ + # Select memory manager depending on user input. +@@ -1647,7 +1647,7 @@ # Extract the library version ID from jpeglib.h. echo $ac_n "checking libjpeg version number""... $ac_c" 1>&6 echo "configure:1650: checking libjpeg version number" >&5 diff --git a/graphics/jpeg/pkg-plist b/graphics/jpeg/pkg-plist index 558fd8902e1c..1b79cfeab6dd 100644 --- a/graphics/jpeg/pkg-plist +++ b/graphics/jpeg/pkg-plist @@ -3,6 +3,13 @@ bin/djpeg bin/jpegtran bin/rdjpgcom bin/wrjpgcom +include/jconfig.h +include/jerror.h +include/jmorecfg.h +include/jpeglib.h +lib/libjpeg.a +lib/libjpeg.so +lib/libjpeg.so.9 share/doc/jpeg/README share/doc/jpeg/coderules.doc share/doc/jpeg/filelist.doc @@ -12,12 +19,4 @@ share/doc/jpeg/libjpeg.doc share/doc/jpeg/structure.doc share/doc/jpeg/usage.doc share/doc/jpeg/wizard.doc -include/jconfig.h -include/jerror.h -include/jmorecfg.h -include/jpeglib.h -lib/libjpeg.a -lib/libjpeg.la -lib/libjpeg.so -lib/libjpeg.so.9 @dirrm share/doc/jpeg |