diff options
author | sat <sat@FreeBSD.org> | 2006-12-03 04:23:23 +0000 |
---|---|---|
committer | sat <sat@FreeBSD.org> | 2006-12-03 04:23:23 +0000 |
commit | c24d38eccf3889acceef2ef7ddbd582812cc339d (patch) | |
tree | 9ff0e020a0f2b89acf4e4f00c6a1597553a956c5 /astro/tkgeomap | |
parent | 25c5d8a7b27ec97d4df5570869b29e9642c2661c (diff) | |
download | FreeBSD-ports-c24d38eccf3889acceef2ef7ddbd582812cc339d.zip FreeBSD-ports-c24d38eccf3889acceef2ef7ddbd582812cc339d.tar.gz |
- Respect X11BASE
- Add some forgotten changes
Reported by: pointyhat via kris
Diffstat (limited to 'astro/tkgeomap')
-rw-r--r-- | astro/tkgeomap/Makefile | 11 | ||||
-rw-r--r-- | astro/tkgeomap/pkg-plist | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/astro/tkgeomap/Makefile b/astro/tkgeomap/Makefile index d378dd2..32e0c1a 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 70ed6d5..0421ee7 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 |