diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2006-06-07 00:12:48 +0800 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2006-06-07 00:12:48 +0800 |
| commit | 55a9b9dd373db582fac84982701151595366e552 (patch) | |
| tree | 57ddb5729f507e093549e72d23312cc840edfc97 /graphics/xaralx | |
| parent | efe0ee61964216558cc0a40d8c1d2adecdf50755 (diff) | |
| download | freebsd-ports-gnome-55a9b9dd373db582fac84982701151595366e552.tar.gz freebsd-ports-gnome-55a9b9dd373db582fac84982701151595366e552.tar.zst freebsd-ports-gnome-55a9b9dd373db582fac84982701151595366e552.zip | |
* Upgrade graphics/xaralx-devel from 0.5r1250 to 0.5r1261
* Install the executable and the man page under xaralx rather than XaraLX
to avoid the need to patch the .desktop file which refers to xaralx
Diffstat (limited to 'graphics/xaralx')
| -rw-r--r-- | graphics/xaralx/Makefile | 16 | ||||
| -rw-r--r-- | graphics/xaralx/pkg-plist | 2 |
2 files changed, 7 insertions, 11 deletions
diff --git a/graphics/xaralx/Makefile b/graphics/xaralx/Makefile index 6d3c153b1c2b..c1a23c896d2a 100644 --- a/graphics/xaralx/Makefile +++ b/graphics/xaralx/Makefile @@ -41,11 +41,11 @@ CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -ldlmalloc" USE_GMAKE= yes # add wxOil with -I- appended to it before any other -I stuff, see below -MAKE_ENV+= INCLUDES="-I../wxOil -I- -I${LOCALBASE}/include/dlmalloc" +MAKE_ENV?= INCLUDES="-I../wxOil -I- -I${LOCALBASE}/include/dlmalloc" USE_GCC= 3.4+ -MAN1= XaraLX${PKGNAMESUFFIX}.1 +MAN1= xaralx${PKGNAMESUFFIX}.1 .if !defined(NOPORTDOCS) DOCS_IN_WRKSRC= AUTHORS GPL LICENSE README @@ -72,18 +72,14 @@ PLIST_SUB+= PKGNAMESUFFIX=${PKGNAMESUFFIX} \ BROKEN= does not configure due to the lack of CDraw libraries for ${ARCH} .endif +.if !defined(PKGNAMESUFFIX) # we need to strip wxOil from the include path because it contains file # named strings.h which when included by /usr/include/string.h results # in a complete mess post-patch: ${REINPLACE_CMD} -E -e 's|-I[^[:space:]]*/wxOil[[:space:]]||g' \ ${WRKSRC}/Makefile.am - ${REINPLACE_CMD} -E \ - -e 's/^Name=Xara LX$$/Name=Xara LX (${PORTVERSION})/' \ - -e 's/^FilePattern=xaralx;$$/FilePattern=XaraLX/' \ - -e 's/^Exec=xaralx %F$$/Exec=XaraLX %F/' \ - -e 's/^TryExec=xaralx$$/TryExec=XaraLX/' \ - ${WRKSRC}/xaralx.desktop +.endif pre-configure: cd ${WRKSRC} && \ @@ -96,7 +92,7 @@ do-install: ${MKDIR} ${DESKTOPDIR} ${MKDIR} ${EXAMPLESDIR} ${INSTALL_PROGRAM} ${WRKSRC}/XaraLX \ - ${PREFIX}/bin/XaraLX${PKGNAMESUFFIX} + ${PREFIX}/bin/xaralx${PKGNAMESUFFIX} ${INSTALL_DATA} ${WRKSRC}/xaralx.desktop \ ${DESKTOPDIR}/xaralx${PKGNAMESUFFIX}.desktop ${INSTALL_DATA} ${WRKSRC}/xaralx.png \ @@ -106,7 +102,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${xardir}/*.xar ${EXAMPLESDIR}/${xardir}/ .endfor ${INSTALL_MAN} ${WRKSRC}/doc/XaraLX.1 \ - ${MANPREFIX}/man/man1/XaraLX${PKGNAMESUFFIX}.1 + ${MANPREFIX}/man/man1/xaralx${PKGNAMESUFFIX}.1 .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${MKDIR} ${DOCSDIR}/en diff --git a/graphics/xaralx/pkg-plist b/graphics/xaralx/pkg-plist index 6aa56048e8d1..ca9f4e2b9a0c 100644 --- a/graphics/xaralx/pkg-plist +++ b/graphics/xaralx/pkg-plist @@ -1,4 +1,4 @@ -bin/XaraLX%%PKGNAMESUFFIX%% +bin/xaralx%%PKGNAMESUFFIX%% %%DESKTOPDIR%%/xaralx%%PKGNAMESUFFIX%%.desktop %%PIXMAPSDIR%%/xaralx%%PKGNAMESUFFIX%%.png %%EXAMPLESDIR%%/Designs/53 Corvette.xar |