From dc1177a9a5be3b096b2023326ea54d3152bf1571 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Fri, 16 Jun 2000 08:48:22 +0000 Subject: Fourth round of INSTALLS_SHLIBS conversion. --- x11/kde4-baseapps/Makefile | 1 + x11/kde4-baseapps/pkg-plist | 2 -- x11/kde4-runtime/Makefile | 1 + x11/kde4-runtime/pkg-plist | 2 -- x11/kde4-workspace/Makefile | 1 + x11/kde4-workspace/pkg-plist | 2 -- x11/kdebase2/Makefile | 1 + x11/kdebase2/pkg-plist | 2 -- x11/kdebase3/Makefile | 1 + x11/kdebase3/pkg-plist | 2 -- x11/kdebase4-runtime/Makefile | 1 + x11/kdebase4-runtime/pkg-plist | 2 -- x11/kdebase4-workspace/Makefile | 1 + x11/kdebase4-workspace/pkg-plist | 2 -- x11/kdebase4/Makefile | 1 + x11/kdebase4/pkg-plist | 2 -- x11/kdelibs11/Makefile | 1 + x11/kdelibs11/pkg-plist | 2 -- x11/kdelibs2/Makefile | 1 + x11/kdelibs2/pkg-plist | 2 -- x11/kdelibs3/Makefile | 1 + x11/kdelibs3/pkg-plist | 2 -- x11/kdelibs4/Makefile | 1 + x11/kdelibs4/pkg-plist | 2 -- x11/libdnd/Makefile | 2 +- x11/libdnd/pkg-plist | 2 -- 26 files changed, 13 insertions(+), 27 deletions(-) (limited to 'x11') diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index cda7136c2f65..3631ae463be9 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -20,6 +20,7 @@ LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes USE_QT2= yes +INSTALLS_SHLIBS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \ --with-qt-dir=${X11BASE} \ diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index 7906bc632d7e..df4215b2832a 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -1874,5 +1874,3 @@ share/wallpapers/kdm_bg.jpg @dirrm share/applnk/Games @dirrm share/applnk/Control @dirrm share/applnk/Applications -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index cda7136c2f65..3631ae463be9 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -20,6 +20,7 @@ LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes USE_QT2= yes +INSTALLS_SHLIBS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \ --with-qt-dir=${X11BASE} \ diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index 7906bc632d7e..df4215b2832a 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -1874,5 +1874,3 @@ share/wallpapers/kdm_bg.jpg @dirrm share/applnk/Games @dirrm share/applnk/Control @dirrm share/applnk/Applications -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index cda7136c2f65..3631ae463be9 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -20,6 +20,7 @@ LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes USE_QT2= yes +INSTALLS_SHLIBS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \ --with-qt-dir=${X11BASE} \ diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index 7906bc632d7e..df4215b2832a 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -1874,5 +1874,3 @@ share/wallpapers/kdm_bg.jpg @dirrm share/applnk/Games @dirrm share/applnk/Control @dirrm share/applnk/Applications -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index cda7136c2f65..3631ae463be9 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -20,6 +20,7 @@ LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes USE_QT2= yes +INSTALLS_SHLIBS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \ --with-qt-dir=${X11BASE} \ diff --git a/x11/kdebase2/pkg-plist b/x11/kdebase2/pkg-plist index 7906bc632d7e..df4215b2832a 100644 --- a/x11/kdebase2/pkg-plist +++ b/x11/kdebase2/pkg-plist @@ -1874,5 +1874,3 @@ share/wallpapers/kdm_bg.jpg @dirrm share/applnk/Games @dirrm share/applnk/Control @dirrm share/applnk/Applications -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index cda7136c2f65..3631ae463be9 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -20,6 +20,7 @@ LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes USE_QT2= yes +INSTALLS_SHLIBS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \ --with-qt-dir=${X11BASE} \ diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist index 7906bc632d7e..df4215b2832a 100644 --- a/x11/kdebase3/pkg-plist +++ b/x11/kdebase3/pkg-plist @@ -1874,5 +1874,3 @@ share/wallpapers/kdm_bg.jpg @dirrm share/applnk/Games @dirrm share/applnk/Control @dirrm share/applnk/Applications -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index cda7136c2f65..3631ae463be9 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -20,6 +20,7 @@ LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes USE_QT2= yes +INSTALLS_SHLIBS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \ --with-qt-dir=${X11BASE} \ diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist index 7906bc632d7e..df4215b2832a 100644 --- a/x11/kdebase4-runtime/pkg-plist +++ b/x11/kdebase4-runtime/pkg-plist @@ -1874,5 +1874,3 @@ share/wallpapers/kdm_bg.jpg @dirrm share/applnk/Games @dirrm share/applnk/Control @dirrm share/applnk/Applications -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index cda7136c2f65..3631ae463be9 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -20,6 +20,7 @@ LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes USE_QT2= yes +INSTALLS_SHLIBS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \ --with-qt-dir=${X11BASE} \ diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist index 7906bc632d7e..df4215b2832a 100644 --- a/x11/kdebase4-workspace/pkg-plist +++ b/x11/kdebase4-workspace/pkg-plist @@ -1874,5 +1874,3 @@ share/wallpapers/kdm_bg.jpg @dirrm share/applnk/Games @dirrm share/applnk/Control @dirrm share/applnk/Applications -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index cda7136c2f65..3631ae463be9 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -20,6 +20,7 @@ LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \ MOC?= ${X11BASE}/bin/moc2 USE_BZIP2= yes USE_QT2= yes +INSTALLS_SHLIBS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \ --with-qt-dir=${X11BASE} \ diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist index 7906bc632d7e..df4215b2832a 100644 --- a/x11/kdebase4/pkg-plist +++ b/x11/kdebase4/pkg-plist @@ -1874,5 +1874,3 @@ share/wallpapers/kdm_bg.jpg @dirrm share/applnk/Games @dirrm share/applnk/Control @dirrm share/applnk/Applications -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile index 89b5b877ff7e..454d5483c01b 100644 --- a/x11/kdelibs11/Makefile +++ b/x11/kdelibs11/Makefile @@ -25,6 +25,7 @@ MAKE_ENV+= SOMAJOR="${LIBVER}" SOMINOR="0" USE_BZIP2= yes USE_GMAKE= yes USE_QT= yes +INSTALLS_SHLIBS= yes USE_LIBTOOL= yes LIBTOOLFLAGS= CONFIGURE_ARGS= --enable-shared --x-includes="$(X11BASE)/include" \ diff --git a/x11/kdelibs11/pkg-plist b/x11/kdelibs11/pkg-plist index ee85d17dbc51..ace82176e6be 100644 --- a/x11/kdelibs11/pkg-plist +++ b/x11/kdelibs11/pkg-plist @@ -311,8 +311,6 @@ share/toolbar/viewmag+.xpm share/toolbar/viewmag-.xpm share/toolbar/viewmag.xpm share/toolbar/viewzoom.xpm -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R @unexec rmdir %D/share/wallpapers 2>/dev/null || true @unexec rmdir %D/share/toolbar 2>/dev/null || true @unexec rmdir %D/share/sounds 2>/dev/null || true diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 3396e22df38d..3c36057f163d 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -23,6 +23,7 @@ SOMAJOR= 4 SOMINOR= 0 USE_BZIP2= yes USE_QT2= yes +INSTALLS_SHLIBS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \ --with-qt-includes=${X11BASE}/include/qt2 \ diff --git a/x11/kdelibs2/pkg-plist b/x11/kdelibs2/pkg-plist index 97357af16629..918aac05d4a7 100644 --- a/x11/kdelibs2/pkg-plist +++ b/x11/kdelibs2/pkg-plist @@ -1491,5 +1491,3 @@ share/toolbar/configure.png @dirrm include/dom @dirrm include/artsc @dirrm include/arts -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 3396e22df38d..3c36057f163d 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -23,6 +23,7 @@ SOMAJOR= 4 SOMINOR= 0 USE_BZIP2= yes USE_QT2= yes +INSTALLS_SHLIBS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \ --with-qt-includes=${X11BASE}/include/qt2 \ diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist index 97357af16629..918aac05d4a7 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -1491,5 +1491,3 @@ share/toolbar/configure.png @dirrm include/dom @dirrm include/artsc @dirrm include/arts -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 3396e22df38d..3c36057f163d 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -23,6 +23,7 @@ SOMAJOR= 4 SOMINOR= 0 USE_BZIP2= yes USE_QT2= yes +INSTALLS_SHLIBS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \ --with-qt-includes=${X11BASE}/include/qt2 \ diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index 97357af16629..918aac05d4a7 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -1491,5 +1491,3 @@ share/toolbar/configure.png @dirrm include/dom @dirrm include/artsc @dirrm include/arts -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile index 6fdc71c345c4..f9f6b3bef12e 100644 --- a/x11/libdnd/Makefile +++ b/x11/libdnd/Makefile @@ -15,6 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= lukin@okbmei.msk.su USE_XLIB= yes +INSTALLS_SHLIBS= yes WRKSRC= ${WRKDIR}/DND/DNDlib GNU_CONFIGURE= yes @@ -23,6 +24,5 @@ post-install: ${MKDIR} ${PREFIX}/share/doc/libdnd ${INSTALL_MAN} ${WRKDIR}/DND/DNDdoc/* ${PREFIX}/share/doc/libdnd .endif - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include diff --git a/x11/libdnd/pkg-plist b/x11/libdnd/pkg-plist index 4124da0c6ef8..1f9d9d6ea097 100644 --- a/x11/libdnd/pkg-plist +++ b/x11/libdnd/pkg-plist @@ -6,8 +6,6 @@ lib/libDnd.so lib/libDnd.so.1 lib/libDnd++.so lib/libDnd++.so.1 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/doc/libdnd/DND.dvi share/doc/libdnd/DNDa4.ps share/doc/libdnd/DNDletter.ps -- cgit v1.2.3