From 835d6b8655813f2580f5db9fcbec03a34833ec92 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Thu, 15 Jun 2000 17:59:45 +0000 Subject: Third round of INSTALL_SHLIBS=yes fixes. --- graphics/pgplot/Makefile | 2 +- graphics/pgplot/pkg-plist | 2 -- graphics/plotutils/Makefile | 4 +--- graphics/plotutils/pkg-plist | 2 -- graphics/png/Makefile | 5 ++--- graphics/png/pkg-plist | 2 -- graphics/sane-backends/Makefile | 1 + graphics/sane-backends/pkg-plist | 2 -- graphics/sane-frontends/Makefile | 1 + graphics/sane-frontends/pkg-plist | 2 -- graphics/sane/Makefile | 1 + graphics/sane/pkg-plist | 2 -- graphics/smpeg/Makefile | 1 + graphics/smpeg/pkg-plist | 2 -- graphics/tiff/Makefile | 4 +--- graphics/tiff/pkg-plist | 2 -- graphics/tiff/pkg-plist.nodocs | 2 -- graphics/tifmerge/Makefile | 4 +--- graphics/tifmerge/pkg-plist | 2 -- 19 files changed, 10 insertions(+), 33 deletions(-) (limited to 'graphics') diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile index be26d74586df..f5aab1dcb296 100644 --- a/graphics/pgplot/Makefile +++ b/graphics/pgplot/Makefile @@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= jmz@FreeBSD.org USE_XLIB= yes +INSTALL_SHLIBS= yes WRKSRC= ${WRKDIR}/pgplot .include @@ -36,6 +37,5 @@ post-install: .for f in libcpgplot.so libpgplot.so ${LN} -sf $f.${VERSION} ${PREFIX}/lib/$f .endfor - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include diff --git a/graphics/pgplot/pkg-plist b/graphics/pgplot/pkg-plist index c4ac9e295e47..c34cd6336e60 100644 --- a/graphics/pgplot/pkg-plist +++ b/graphics/pgplot/pkg-plist @@ -7,8 +7,6 @@ lib/libcpgplot.so.5.2 lib/libpgplot.a lib/libpgplot.so lib/libpgplot.so.5.2 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/pgplot/Makefile.demo share/pgplot/cpgdemo.c share/pgplot/cpgplot.doc diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile index 05f0ecba86de..0bec7078c7ea 100644 --- a/graphics/plotutils/Makefile +++ b/graphics/plotutils/Makefile @@ -15,6 +15,7 @@ MAINTAINER= chuckr@FreeBSD.org USE_XLIB= yes USE_LIBTOOL= yes +INSTALL_SHLIBS= yes USE_NEWGCC= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-libplotter --enable-libxmi @@ -27,7 +28,4 @@ CONFIGURE_ENV= MOTIFLIB="${MOTIFLIB}" REQUIRES_MOTIF= yes .endif -post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - .include diff --git a/graphics/plotutils/pkg-plist b/graphics/plotutils/pkg-plist index 6a735aed59e8..1fc0ab3b2796 100644 --- a/graphics/plotutils/pkg-plist +++ b/graphics/plotutils/pkg-plist @@ -56,8 +56,6 @@ lib/libplotter.a lib/libxmi.so lib/libxmi.so.1 lib/libxmi.a -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R include/plot.h include/plotcompat.h include/plotter.h diff --git a/graphics/png/Makefile b/graphics/png/Makefile index baf7dacee2d8..65f04acfcdda 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -21,13 +21,12 @@ PATCHFILES= libpng-1.0.6-patch-a.txt.gz \ MAINTAINER= ache@FreeBSD.org +INSTALL_SHLIBS= yes + MAN3= libpng.3 libpngpf.3 MAN5= png.5 do-configure: cd ${WRKSRC} && ${CP} scripts/makefile.std Makefile -post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - .include diff --git a/graphics/png/pkg-plist b/graphics/png/pkg-plist index dc7321bf1daf..0106ac62a87c 100644 --- a/graphics/png/pkg-plist +++ b/graphics/png/pkg-plist @@ -4,5 +4,3 @@ lib/libpng.a lib/libpng.so.3 @exec ln -sf %f %B/libpng.so @unexec rm -f %B/libpng.so -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index eafc4bd5ff95..14deea1babb3 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -21,6 +21,7 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_GMAKE= yes USE_LIBTOOL= yes +INSTALL_SHLIBS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist index 6592dd0dfbdb..eb9071549fa1 100644 --- a/graphics/sane-backends/pkg-plist +++ b/graphics/sane-backends/pkg-plist @@ -119,8 +119,6 @@ lib/sane/libsane-tamarack.so.1 lib/sane/libsane-umax.a lib/sane/libsane-umax.so lib/sane/libsane-umax.so.1 -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R sbin/saned share/sane-style.rc @dirrm lib/sane diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile index eafc4bd5ff95..14deea1babb3 100644 --- a/graphics/sane-frontends/Makefile +++ b/graphics/sane-frontends/Makefile @@ -21,6 +21,7 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_GMAKE= yes USE_LIBTOOL= yes +INSTALL_SHLIBS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/sane-frontends/pkg-plist b/graphics/sane-frontends/pkg-plist index 6592dd0dfbdb..eb9071549fa1 100644 --- a/graphics/sane-frontends/pkg-plist +++ b/graphics/sane-frontends/pkg-plist @@ -119,8 +119,6 @@ lib/sane/libsane-tamarack.so.1 lib/sane/libsane-umax.a lib/sane/libsane-umax.so lib/sane/libsane-umax.so.1 -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R sbin/saned share/sane-style.rc @dirrm lib/sane diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile index eafc4bd5ff95..14deea1babb3 100644 --- a/graphics/sane/Makefile +++ b/graphics/sane/Makefile @@ -21,6 +21,7 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_GMAKE= yes USE_LIBTOOL= yes +INSTALL_SHLIBS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/sane/pkg-plist b/graphics/sane/pkg-plist index 6592dd0dfbdb..eb9071549fa1 100644 --- a/graphics/sane/pkg-plist +++ b/graphics/sane/pkg-plist @@ -119,8 +119,6 @@ lib/sane/libsane-tamarack.so.1 lib/sane/libsane-umax.a lib/sane/libsane-umax.so lib/sane/libsane-umax.so.1 -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R sbin/saned share/sane-style.rc @dirrm lib/sane diff --git a/graphics/smpeg/Makefile b/graphics/smpeg/Makefile index c7db05e21f49..8779a3cf2ae4 100644 --- a/graphics/smpeg/Makefile +++ b/graphics/smpeg/Makefile @@ -19,6 +19,7 @@ GTK_CONFIG= ${X11BASE}/bin/gtk12-config SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config GNU_CONFIGURE= yes USE_GMAKE= yes +INSTALL_SHLIBS= yes CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ SDL_CONFIG="${SDL_CONFIG}" \ GLBASE="${X11BASE}" \ diff --git a/graphics/smpeg/pkg-plist b/graphics/smpeg/pkg-plist index 9e5b3d7ddab0..8a7265fe0d26 100644 --- a/graphics/smpeg/pkg-plist +++ b/graphics/smpeg/pkg-plist @@ -15,6 +15,4 @@ lib/libsmpeg.a lib/libsmpeg.la lib/libsmpeg.so lib/libsmpeg.so.0 -@exec /sbin/ldconfig -m %B -@unexec /sbin/ldconfig -R @dirrm include/smpeg diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 196885c21e6d..1dd79e466721 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -18,6 +18,7 @@ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +INSTALL_SHLIBS= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --with-ZIP --with-JPEG \ --with-DIR_BIN=${PREFIX}/bin \ @@ -107,7 +108,4 @@ MLINKS= TIFFError.3t TIFFSetErrorHandler.3t \ TIFFtile.3t TIFFTileSize.3t \ TIFFtile.3t TIFFVTileSize.3t -post-install: - ${LDCONFIG} -m ${PREFIX}/lib - .include diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist index 20c6c6ec6652..b5e80c1d96db 100644 --- a/graphics/tiff/pkg-plist +++ b/graphics/tiff/pkg-plist @@ -22,8 +22,6 @@ include/tiffio.h lib/libtiff.a lib/libtiff.so lib/libtiff.so.4 -@exec /sbin/ldconfig -m %B -@unexec /sbin/ldconfig -R share/doc/tiff/bugs.html share/doc/tiff/build.html share/doc/tiff/contrib.html diff --git a/graphics/tiff/pkg-plist.nodocs b/graphics/tiff/pkg-plist.nodocs index 4033ba1993c2..a58b9d22b918 100644 --- a/graphics/tiff/pkg-plist.nodocs +++ b/graphics/tiff/pkg-plist.nodocs @@ -22,5 +22,3 @@ include/tiffio.h lib/libtiff.a lib/libtiff.so lib/libtiff.so.4 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/graphics/tifmerge/Makefile b/graphics/tifmerge/Makefile index dccfb4d8d256..78764af7179f 100644 --- a/graphics/tifmerge/Makefile +++ b/graphics/tifmerge/Makefile @@ -15,6 +15,7 @@ MAINTAINER= adam@whizkidtech.net BUILD_DEPENDS= tuc:${PORTSDIR}/converters/tuc +INSTALL_SHLIBS= yes USE_ZIP= yes DIST_SUBDIR= tifmerge MAN3= tifmerge.3 @@ -34,7 +35,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/tifmerge.h ${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/tifmerge.3 ${PREFIX}/man/man3 -post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - .include diff --git a/graphics/tifmerge/pkg-plist b/graphics/tifmerge/pkg-plist index 5629dd9aadbe..f2bf248d0117 100644 --- a/graphics/tifmerge/pkg-plist +++ b/graphics/tifmerge/pkg-plist @@ -2,5 +2,3 @@ include/tifmerge.h lib/libtifmerge.a lib/libtifmerge.so lib/libtifmerge.so.1 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -- cgit v1.2.3