diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-06-16 10:38:50 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-06-16 10:38:50 +0000 |
| commit | 5178b48938d20e336ec57a055a01cb66105cd20c (patch) | |
| tree | 7b629f06e72f052bb88c209caf447e4bb6077033 /japanese/Canna | |
| parent | Upgrade to 1.1. (diff) | |
Final round of the INSTALLS_SHLIBS=yes conversion. Few remaining ports with
ldconfig in PLIST need personal consideration.
Notes
Notes:
svn path=/head/; revision=29636
Diffstat (limited to 'japanese/Canna')
| -rw-r--r-- | japanese/Canna/Makefile | 3 | ||||
| -rw-r--r-- | japanese/Canna/pkg-plist | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile index e43d987e1fcf..620c5f83f3f7 100644 --- a/japanese/Canna/Makefile +++ b/japanese/Canna/Makefile @@ -16,6 +16,8 @@ MAINTAINER= max@FreeBSD.org BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake +INSTALLS_SHLIBS= yes + ALL_TARGET= canna INSTALL_TARGET= install install.man MAN1= addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \ @@ -54,7 +56,6 @@ post-install: ${LN} -sf libcanna.so.1.0 ${PREFIX}/lib/libcanna.so ${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so .endif - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib if [ ! -f ${STARTUP_SCRIPT} ]; then \ ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ ${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \ diff --git a/japanese/Canna/pkg-plist b/japanese/Canna/pkg-plist index 8086d76622d2..744467691180 100644 --- a/japanese/Canna/pkg-plist +++ b/japanese/Canna/pkg-plist @@ -119,8 +119,6 @@ lib/libcanna.so.1 lib/libcanna16.a lib/libcanna16.so lib/libcanna16.so.1 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R sbin/cannakill sbin/cannaserver @exec mkdir -p /var/run/canna |