diff options
| -rw-r--r-- | astro/tclgeomap/Makefile | 8 | ||||
| -rw-r--r-- | astro/tclgeomap/pkg-plist | 4 | ||||
| -rw-r--r-- | astro/tkgeomap/Makefile | 11 | ||||
| -rw-r--r-- | astro/tkgeomap/pkg-plist | 4 |
4 files changed, 16 insertions, 11 deletions
diff --git a/astro/tclgeomap/Makefile b/astro/tclgeomap/Makefile index e415d9afbc98..0190ef3cd163 100644 --- a/astro/tclgeomap/Makefile +++ b/astro/tclgeomap/Makefile @@ -20,7 +20,7 @@ USE_TCL= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix PLIST_SUB= INC=include/${PORTNAME} \ - LIB=lib/${PORTNAME} + LIB=lib/${PORTNAME} VER=${PORTVERSION} MAKE_ENV= MKLINKS_FLAGS=-s USE_LDCONFIG= yes @@ -180,8 +180,10 @@ MLINKS= \ tclgeomap_procs.n ocean_list.n post-install: - @${LN} -sf ${PREFIX}/lib/libtclgeomap2.9.so ${PREFIX}/lib/libtclgeomap2.9.so.0 - @${LN} -sf ${PREFIX}/lib/libtclgeomap2.9.so ${PREFIX}/lib/libtclgeomap.so.0 + @${LN} -sf ${PREFIX}/lib/lib${PORTNAME}${PORTVERSION}.so \ + ${PREFIX}/lib/lib${PORTNAME}${PORTVERSION}.so.0 + @${LN} -sf ${PREFIX}/lib/lib${PORTNAME}${PORTVERSION}.so \ + ${PREFIX}/lib/lib${PORTNAME}.so.0 post-patch: @${REINPLACE_CMD} -e 's/@PACKAGE@@VERSION@/@PACKAGE@/g' ${WRKSRC}/Makefile.in ${WRKSRC}/pkgIndex.tcl.in diff --git a/astro/tclgeomap/pkg-plist b/astro/tclgeomap/pkg-plist index 848dc7e1aa80..cdccffac71f7 100644 --- a/astro/tclgeomap/pkg-plist +++ b/astro/tclgeomap/pkg-plist @@ -1,6 +1,6 @@ lib/libtclgeomap.so.0 -lib/libtclgeomap2.9.so -lib/libtclgeomap2.9.so.0 +lib/libtclgeomap%%VER%%.so +lib/libtclgeomap%%VER%%.so.0 %%INC%%/geoLines.h %%INC%%/geoLnArrToMap.h %%INC%%/geoProj.h diff --git a/astro/tkgeomap/Makefile b/astro/tkgeomap/Makefile index d378dd23c6dd..32e0c1a7cc50 100644 --- a/astro/tkgeomap/Makefile +++ b/astro/tkgeomap/Makefile @@ -16,12 +16,13 @@ COMMENT= Read, manipulate and display geo data LIB_DEPENDS= tclgeomap.0:${PORTSDIR}/astro/tclgeomap \ tk${USE_TK}.1:${PORTSDIR}/x11-toolkits/tk${USE_TK} -CONFIGURE_ARGS= --with-tclgeomap-include=${LOCALBASE}/include/tclgeomap --with-x +CONFIGURE_ARGS= --with-tclgeomap-include=${LOCALBASE}/include/tclgeomap --with-x \ + --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include USE_TK= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix PLIST_SUB= INC=include/${PORTNAME} \ - LIB=lib/${PORTNAME} + LIB=lib/${PORTNAME} VER=${PORTVERSION} MAKE_ENV= MKLINKS_FLAGS=-s USE_LDCONFIG= yes @@ -31,8 +32,10 @@ MLINKS= \ wdgeomap.n xytolatlon.n post-install: - @${LN} -sf ${PREFIX}/lib/libtkgeomap2.9.so ${PREFIX}/lib/libtkgeomap2.9.so.0 - @${LN} -sf ${PREFIX}/lib/libtkgeomap2.9.so ${PREFIX}/lib/libtkgeomap.so.0 + @${LN} -sf ${PREFIX}/lib/lib${PORTNAME}${PORTVERSION}.so \ + ${PREFIX}/lib/lib${PORTNAME}${PORTVERSION}.so.0 + @${LN} -sf ${PREFIX}/lib/lib${PORTNAME}${PORTVERSION}.so \ + ${PREFIX}/lib/lib${PORTNAME}.so.0 post-patch: @${REINPLACE_CMD} -e 's/@PACKAGE@@VERSION@/@PACKAGE@/g' ${WRKSRC}/Makefile.in ${WRKSRC}/pkgIndex.tcl.in diff --git a/astro/tkgeomap/pkg-plist b/astro/tkgeomap/pkg-plist index 70ed6d549256..0421ee758580 100644 --- a/astro/tkgeomap/pkg-plist +++ b/astro/tkgeomap/pkg-plist @@ -1,6 +1,6 @@ lib/libtkgeomap.so.0 -lib/libtkgeomap2.9.so -lib/libtkgeomap2.9.so.0 +lib/libtkgeomap%%VER%%.so +lib/libtkgeomap%%VER%%.so.0 %%INC%%/tkgeomap.h %%LIB%%/pkgIndex.tcl %%LIB%%/tkgeomap_procs.tcl |