From 5804ca48ae042b0e7e9696325571cfdd8e4d36be Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Sat, 17 Jun 2000 05:34:04 +0000 Subject: Tell these port to use INSTALLS_SHLIB/LDCONFIG_DIRS. --- databases/namazu2/Makefile | 2 +- databases/namazu2/pkg-plist | 2 -- japanese/eterm/Makefile | 1 + japanese/eterm/pkg-plist | 2 -- japanese/expect/Makefile | 2 +- japanese/expect/pkg-plist | 2 -- japanese/gd/Makefile | 4 ++-- japanese/gd/pkg-plist | 2 -- japanese/gd1/Makefile | 4 ++-- japanese/gd1/pkg-plist | 2 -- japanese/iv/Makefile | 2 +- japanese/iv/pkg-plist | 2 -- japanese/kakasi/Makefile | 2 +- japanese/kakasi/pkg-plist | 2 -- japanese/libicq/Makefile | 1 + japanese/libicq/pkg-plist | 2 -- japanese/libimg/Makefile | 3 ++- japanese/libimg/pkg-plist | 2 -- japanese/libslang/Makefile | 2 +- japanese/libslang/pkg-plist | 2 -- japanese/mh/Makefile | 4 +--- japanese/mh/pkg-plist | 2 -- japanese/namazu2/Makefile | 2 +- japanese/namazu2/pkg-plist | 2 -- japanese/postgresql-tcltk/Makefile | 2 ++ japanese/postgresql-tcltk/pkg-plist | 2 -- japanese/postgresql/Makefile | 2 ++ japanese/postgresql/pkg-plist | 2 -- japanese/postgresql7/Makefile | 2 ++ japanese/postgresql7/pkg-plist | 2 -- japanese/tcl80/Makefile | 1 + japanese/tcl80/pkg-plist | 2 -- japanese/tk80/Makefile | 2 +- japanese/tk80/pkg-plist | 2 -- japanese/tkstep80/Makefile | 1 + japanese/tkstep80/pkg-plist | 2 -- 36 files changed, 24 insertions(+), 51 deletions(-) diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile index f7a2e216a2be..642143e05ecb 100644 --- a/databases/namazu2/Makefile +++ b/databases/namazu2/Makefile @@ -28,9 +28,9 @@ USE_PERL5= yes GNU_CONFIGURE= yes MAN1= namazu.1 mknmz.1 +INSTALLS_SHLIB= yes post-install: ${LN} -sf ${PREFIX}/lib/libnmz.so.3 ${PREFIX}/lib/libnmz.so - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include diff --git a/databases/namazu2/pkg-plist b/databases/namazu2/pkg-plist index 9a3ba5f3e481..68f4147dfb5b 100644 --- a/databases/namazu2/pkg-plist +++ b/databases/namazu2/pkg-plist @@ -31,8 +31,6 @@ lib/libnmz.a lib/libnmz.la lib/libnmz.so lib/libnmz.so.3 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R libexec/namazu.cgi share/locale/ja/LC_MESSAGES/namazu.mo share/locale/ja_JP.SJIS/LC_MESSAGES/namazu.mo diff --git a/japanese/eterm/Makefile b/japanese/eterm/Makefile index 72c4dafbdc5b..a93a991a36aa 100644 --- a/japanese/eterm/Makefile +++ b/japanese/eterm/Makefile @@ -25,6 +25,7 @@ CONFIGURE_ENV= LIBS="-lxpg4" CONFIGURE_ARGS= --enable-trans=imlib --enable-utmp --enable-multi-charset=kanji \ --enable-xim --with-theme-update MAN1= Eterm.1 +INSTALLS_SHLIB= yes post-install: @${CHMOD} 4711 ${PREFIX}/bin/Eterm diff --git a/japanese/eterm/pkg-plist b/japanese/eterm/pkg-plist index 3c3ac5114753..2a0d246dc0aa 100644 --- a/japanese/eterm/pkg-plist +++ b/japanese/eterm/pkg-plist @@ -13,8 +13,6 @@ lib/libmej.a lib/libmej.la lib/libmej.so lib/libmej.so.9 -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/Eterm/pix/014.jpg share/Eterm/pix/40.jpg share/Eterm/pix/backwave.jpg diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile index 76bb31289b38..df2d4db13cba 100644 --- a/japanese/expect/Makefile +++ b/japanese/expect/Makefile @@ -22,11 +22,11 @@ CONFIGURE_ARGS= --enable-shared --with-tclconfig=${PREFIX}/lib/tcl8.0jp \ --with-tkinclude=${PREFIX}/include/tk8.0jp NO_MAN_INSTALL= yes +INSTALLS_SHLIB= yes .include post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .if ${PORTOBJFORMAT} == "aout" ${LN} -sf libexpect530jp.so.1.2 ${PREFIX}/lib/libexpect530jp.so .endif diff --git a/japanese/expect/pkg-plist b/japanese/expect/pkg-plist index 80db078c6380..e4813a762a45 100644 --- a/japanese/expect/pkg-plist +++ b/japanese/expect/pkg-plist @@ -31,5 +31,3 @@ lib/expect5.30jp/pkgIndex.tcl lib/libexpect530jp.a lib/libexpect530jp.so.1.2 lib/libexpect530jp.so -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/japanese/gd/Makefile b/japanese/gd/Makefile index d3cbb78ccee1..3625985f5bb7 100644 --- a/japanese/gd/Makefile +++ b/japanese/gd/Makefile @@ -20,11 +20,11 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png FETCH_BEFORE_ARGS= -b USE_LIBTOOL= yes +CFLAGS+= -DJISX0208 CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" CONFIGURE_ARGS+= --includedir=${PREFIX}/include/gd \ --libdir=${PREFIX}/lib - -CFLAGS= -DJISX0208 +INSTALLS_SHLIB= yes pre-install: ${MKDIR} ${PREFIX}/include/gd diff --git a/japanese/gd/pkg-plist b/japanese/gd/pkg-plist index 4fee7f4df3d7..b3f4b142eb95 100644 --- a/japanese/gd/pkg-plist +++ b/japanese/gd/pkg-plist @@ -15,6 +15,4 @@ include/gd/gdfontt.h lib/libgd.a lib/libgd.so lib/libgd.so.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @dirrm include/gd diff --git a/japanese/gd1/Makefile b/japanese/gd1/Makefile index d3cbb78ccee1..3625985f5bb7 100644 --- a/japanese/gd1/Makefile +++ b/japanese/gd1/Makefile @@ -20,11 +20,11 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png FETCH_BEFORE_ARGS= -b USE_LIBTOOL= yes +CFLAGS+= -DJISX0208 CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" CONFIGURE_ARGS+= --includedir=${PREFIX}/include/gd \ --libdir=${PREFIX}/lib - -CFLAGS= -DJISX0208 +INSTALLS_SHLIB= yes pre-install: ${MKDIR} ${PREFIX}/include/gd diff --git a/japanese/gd1/pkg-plist b/japanese/gd1/pkg-plist index 4fee7f4df3d7..b3f4b142eb95 100644 --- a/japanese/gd1/pkg-plist +++ b/japanese/gd1/pkg-plist @@ -15,6 +15,4 @@ include/gd/gdfontt.h lib/libgd.a lib/libgd.so lib/libgd.so.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @dirrm include/gd diff --git a/japanese/iv/Makefile b/japanese/iv/Makefile index 9b8d0f766c57..6cd45851a3b9 100644 --- a/japanese/iv/Makefile +++ b/japanese/iv/Makefile @@ -63,6 +63,7 @@ MANN= Adjuster.n Banner.n BasicDialog.n Border.n Box2_6.n \ .include +INSTALLS_SHLIB= yes .if ${PORTOBJFORMAT} == "elf" IV_LIB_VER= 3 .else @@ -85,6 +86,5 @@ post-install: @${LN} -fs ../interviews/lib/libUnidraw.so.${IV_LIB_VER} ${PREFIX}/lib @${LN} -fs ${PREFIX}/lib/libIV.so.${IV_LIB_VER} ${PREFIX}/lib/libIV.so @${LN} -fs ${PREFIX}/lib/libUnidraw.so.${IV_LIB_VER} ${PREFIX}/lib/libUnidraw.so - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include diff --git a/japanese/iv/pkg-plist b/japanese/iv/pkg-plist index 8df26bc78191..2cbc9078a14c 100644 --- a/japanese/iv/pkg-plist +++ b/japanese/iv/pkg-plist @@ -524,8 +524,6 @@ lib/libIV.so lib/libIV.so.3.1 lib/libUnidraw.so lib/libUnidraw.so.3.1 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @dirrm interviews/bin @dirrm interviews/config/InterViews @dirrm interviews/config diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile index 2053dec02eba..34f950a7d38f 100644 --- a/japanese/kakasi/Makefile +++ b/japanese/kakasi/Makefile @@ -16,9 +16,9 @@ GNU_CONFIGURE= yes MANLANG= ja MAN1= kakasi.1 +INSTALLS_SHLIB= yes post-install: - @${LDCONFIG} -m ${PREFIX}/lib ${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${PREFIX}/man/${MANLANG}/man1 .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/kakasi diff --git a/japanese/kakasi/pkg-plist b/japanese/kakasi/pkg-plist index fccce1337085..2f5c10de88ce 100644 --- a/japanese/kakasi/pkg-plist +++ b/japanese/kakasi/pkg-plist @@ -8,8 +8,6 @@ lib/libkakasi.a lib/libkakasi.la lib/libkakasi.so lib/libkakasi.so.2 -@exec /sbin/ldconfig -m %B -@unexec /sbin/ldconfig -R share/doc/kakasi/ChangeLog.lib share/doc/kakasi/JISYO share/doc/kakasi/README.BeOS diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile index 3012797cfa3f..4c195abc2388 100644 --- a/japanese/libicq/Makefile +++ b/japanese/libicq/Makefile @@ -24,5 +24,6 @@ GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config USE_LIBTOOL= yes CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" +INSTALLS_SHLIB= yes .include diff --git a/japanese/libicq/pkg-plist b/japanese/libicq/pkg-plist index c717b5fc0c3c..c5b2f94bc6bd 100644 --- a/japanese/libicq/pkg-plist +++ b/japanese/libicq/pkg-plist @@ -2,5 +2,3 @@ include/libicq.h lib/libicq.a lib/libicq.so lib/libicq.so.0.3 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/japanese/libimg/Makefile b/japanese/libimg/Makefile index 5c1a24e307de..fd959ea493ab 100644 --- a/japanese/libimg/Makefile +++ b/japanese/libimg/Makefile @@ -22,6 +22,8 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl${TCLVERSION}jp \ --with-tk=${PREFIX}/lib/tk${TKVERSION}jp \ --disable-stubs +INSTALLS_SHLIB= yes +LDCONFIG_DIRS= ${PREFIX}/lib/Img1.2 TCLVERSION= 8.0 TKVERSION= 8.0 @@ -42,6 +44,5 @@ post-install: .else ${LN} -sf libimg12.so.1 ${PREFIX}/lib/Img1.2/libimg12.so .endif - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/Img1.2 .include diff --git a/japanese/libimg/pkg-plist b/japanese/libimg/pkg-plist index 0f3fff0e3b27..b8f48c436a93 100644 --- a/japanese/libimg/pkg-plist +++ b/japanese/libimg/pkg-plist @@ -1,7 +1,5 @@ lib/Img1.2/libimg12.so lib/Img1.2/libimg12.so.1 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/Img1.2 -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R lib/Img1.2/pkgIndex.tcl share/doc/img/ANNOUNCE share/doc/img/README diff --git a/japanese/libslang/Makefile b/japanese/libslang/Makefile index 090ae7449141..2f36544dfbb4 100644 --- a/japanese/libslang/Makefile +++ b/japanese/libslang/Makefile @@ -27,9 +27,9 @@ WRKSRC= ${WRKDIR}/slang-${PREV_VERSION} CONFIGURE_ARGS= --includedir=${PREFIX}/include/slang ALL_TARGET= all elf INSTALL_TARGET= install-elf +INSTALLS_SHLIB= yes post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib ${CP} ${WRKSRC}/slang-j.doc ${PREFIX}/share/doc/slang .include diff --git a/japanese/libslang/pkg-plist b/japanese/libslang/pkg-plist index ae09fd0836ef..c29dd4dcd428 100644 --- a/japanese/libslang/pkg-plist +++ b/japanese/libslang/pkg-plist @@ -1,8 +1,6 @@ lib/libslang.a lib/libslang.so lib/libslang.so.2 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R include/slang/slang.h include/slang/slcurses.h include/slang/slkanji.h diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile index b83f82e7225b..822c7f6dbcc8 100644 --- a/japanese/mh/Makefile +++ b/japanese/mh/Makefile @@ -34,8 +34,6 @@ MAN5= mh-alias.5 mh-format.5 mh-mail.5 mh-profile.5 mh-sequence.5 mh-tailor.5 MAN8= ap.8 conflict.8 dp.8 fmtdump.8 install-mh.8 post.8 MANLANG= "" ja MANCOMPRESSED= yes - -post-install: - ${LDCONFIG} -m ${PREFIX}/lib +INSTALLS_SHLIB= yes .include diff --git a/japanese/mh/pkg-plist b/japanese/mh/pkg-plist index 24f4cda98829..9c4ea4a02db4 100644 --- a/japanese/mh/pkg-plist +++ b/japanese/mh/pkg-plist @@ -69,5 +69,3 @@ lib/mh/spost lib/mh/tmac.h lib/mh/viamail lib/libmh.so.3.2 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile index f7a2e216a2be..642143e05ecb 100644 --- a/japanese/namazu2/Makefile +++ b/japanese/namazu2/Makefile @@ -28,9 +28,9 @@ USE_PERL5= yes GNU_CONFIGURE= yes MAN1= namazu.1 mknmz.1 +INSTALLS_SHLIB= yes post-install: ${LN} -sf ${PREFIX}/lib/libnmz.so.3 ${PREFIX}/lib/libnmz.so - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include diff --git a/japanese/namazu2/pkg-plist b/japanese/namazu2/pkg-plist index 9a3ba5f3e481..68f4147dfb5b 100644 --- a/japanese/namazu2/pkg-plist +++ b/japanese/namazu2/pkg-plist @@ -31,8 +31,6 @@ lib/libnmz.a lib/libnmz.la lib/libnmz.so lib/libnmz.so.3 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R libexec/namazu.cgi share/locale/ja/LC_MESSAGES/namazu.mo share/locale/ja_JP.SJIS/LC_MESSAGES/namazu.mo diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile index b6d64f7cee1b..39b23734d35f 100644 --- a/japanese/postgresql-tcltk/Makefile +++ b/japanese/postgresql-tcltk/Makefile @@ -74,6 +74,8 @@ MANL= abort.l alter_table.l alter_user.l begin.l close.l cluster.l \ select.l set.l show.l sql.l update.l vacuum.l MANPREFIX= ${PREFIX}/${INSTALL_DIR} +INSTALLS_SHLIB= yes +LDCONFIG_DIRS= ${PREFIX}/${INSTALL_DIR}/lib PLIST_SUB= INSTALL_DIR=${INSTALL_DIR} PLIST= ${WRKDIR}/PLIST diff --git a/japanese/postgresql-tcltk/pkg-plist b/japanese/postgresql-tcltk/pkg-plist index b0075a9476ef..8e2e081e3d1d 100644 --- a/japanese/postgresql-tcltk/pkg-plist +++ b/japanese/postgresql-tcltk/pkg-plist @@ -269,5 +269,3 @@ share/doc/%%INSTALL_DIR%%/KNOWN_BUGS share/doc/%%INSTALL_DIR%%/MISSING_FEATURES share/doc/%%INSTALL_DIR%%/README.Charsets share/doc/%%INSTALL_DIR%%/README.NT -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/japanese/postgresql/Makefile b/japanese/postgresql/Makefile index b6d64f7cee1b..39b23734d35f 100644 --- a/japanese/postgresql/Makefile +++ b/japanese/postgresql/Makefile @@ -74,6 +74,8 @@ MANL= abort.l alter_table.l alter_user.l begin.l close.l cluster.l \ select.l set.l show.l sql.l update.l vacuum.l MANPREFIX= ${PREFIX}/${INSTALL_DIR} +INSTALLS_SHLIB= yes +LDCONFIG_DIRS= ${PREFIX}/${INSTALL_DIR}/lib PLIST_SUB= INSTALL_DIR=${INSTALL_DIR} PLIST= ${WRKDIR}/PLIST diff --git a/japanese/postgresql/pkg-plist b/japanese/postgresql/pkg-plist index b0075a9476ef..8e2e081e3d1d 100644 --- a/japanese/postgresql/pkg-plist +++ b/japanese/postgresql/pkg-plist @@ -269,5 +269,3 @@ share/doc/%%INSTALL_DIR%%/KNOWN_BUGS share/doc/%%INSTALL_DIR%%/MISSING_FEATURES share/doc/%%INSTALL_DIR%%/README.Charsets share/doc/%%INSTALL_DIR%%/README.NT -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/japanese/postgresql7/Makefile b/japanese/postgresql7/Makefile index b6d64f7cee1b..39b23734d35f 100644 --- a/japanese/postgresql7/Makefile +++ b/japanese/postgresql7/Makefile @@ -74,6 +74,8 @@ MANL= abort.l alter_table.l alter_user.l begin.l close.l cluster.l \ select.l set.l show.l sql.l update.l vacuum.l MANPREFIX= ${PREFIX}/${INSTALL_DIR} +INSTALLS_SHLIB= yes +LDCONFIG_DIRS= ${PREFIX}/${INSTALL_DIR}/lib PLIST_SUB= INSTALL_DIR=${INSTALL_DIR} PLIST= ${WRKDIR}/PLIST diff --git a/japanese/postgresql7/pkg-plist b/japanese/postgresql7/pkg-plist index b0075a9476ef..8e2e081e3d1d 100644 --- a/japanese/postgresql7/pkg-plist +++ b/japanese/postgresql7/pkg-plist @@ -269,5 +269,3 @@ share/doc/%%INSTALL_DIR%%/KNOWN_BUGS share/doc/%%INSTALL_DIR%%/MISSING_FEATURES share/doc/%%INSTALL_DIR%%/README.Charsets share/doc/%%INSTALL_DIR%%/README.NT -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/japanese/tcl80/Makefile b/japanese/tcl80/Makefile index 78f61f981168..bc41dd443d84 100644 --- a/japanese/tcl80/Makefile +++ b/japanese/tcl80/Makefile @@ -30,6 +30,7 @@ CONFIGURE_ARGS= --enable-shared RANLIB= ranlib PKGINSTALL= ${PORTSDIR}/lang/tcl82/pkg/INSTALL.tclsh PKGDEINSTALL= ${PORTSDIR}/lang/tcl82/pkg/DEINSTALL.tclsh +INSTALLS_SHLIB= yes .include diff --git a/japanese/tcl80/pkg-plist b/japanese/tcl80/pkg-plist index ac6a386272aa..7f4c708c0e12 100644 --- a/japanese/tcl80/pkg-plist +++ b/japanese/tcl80/pkg-plist @@ -2,8 +2,6 @@ bin/tclsh8.0jp lib/libtcl80jp.a lib/libtcl80jp.so.1.5 lib/libtcl80jp.so -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R include/tcl8.0jp/tcl.h include/tcl8.0jp/generic/tcl.h include/tcl8.0jp/generic/tclCompile.h diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile index a6ec332b2528..d30b39e7d26f 100644 --- a/japanese/tk80/Makefile +++ b/japanese/tk80/Makefile @@ -31,6 +31,7 @@ USE_XLIB= yes CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp \ --enable-xlibHack --enable-onTheSpot RANLIB= ranlib +INSTALLS_SHLIB= yes .include @@ -52,7 +53,6 @@ post-install: Incompat80jp ${PREFIX}/share/doc/tk${VERSION}jp; \ ) .endif - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .if ${PORTOBJFORMAT} == "aout" ${LN} -sf libtk80jp.so.1.5 ${PREFIX}/lib/libtk80jp.so ${RANLIB} ${PREFIX}/lib/libtk80jp.so diff --git a/japanese/tk80/pkg-plist b/japanese/tk80/pkg-plist index 44caebd5aaa5..9d361765d65c 100644 --- a/japanese/tk80/pkg-plist +++ b/japanese/tk80/pkg-plist @@ -2,8 +2,6 @@ bin/wish8.0jp lib/libtk80jp.a lib/libtk80jp.so.1.5 lib/libtk80jp.so -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R include/tk8.0jp/tk.h include/tk8.0jp/generic/default.h include/tk8.0jp/generic/ks_names.h diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile index 6da3765b708e..cb2d216636af 100644 --- a/japanese/tkstep80/Makefile +++ b/japanese/tkstep80/Makefile @@ -33,6 +33,7 @@ PATCH_DIST_ARGS=-d ${TOPDIR} --forward --quiet -E ${PATCH_DIST_STRIP} .endif PKGINSTALL= ${PORTSDIR}/x11-toolkits/tk82/pkg/INSTALL.wish PKGDEINSTALL= ${PORTSDIR}/x11-toolkits/tk82/pkg/DEINSTALL.wish +INSTALLS_SHLIB= yes TCLVERSION= 8.0 TOPDIR= ${WRKDIR}/${DISTNAME} diff --git a/japanese/tkstep80/pkg-plist b/japanese/tkstep80/pkg-plist index fdf3398e445e..8a6286c963fb 100644 --- a/japanese/tkstep80/pkg-plist +++ b/japanese/tkstep80/pkg-plist @@ -25,8 +25,6 @@ include/tkstep8.0jp/unix/tkUnixPort.h lib/libtkstep80jp.a lib/libtkstep80jp.so lib/libtkstep80jp.so.1 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R lib/tkstep8.0jp/FontChooser.tcl lib/tkstep8.0jp/bgerror.tcl lib/tkstep8.0jp/button.tcl -- cgit v1.2.3