cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Upgrade graphics/xaralx-devel from 0.5r1250 to 0.5r1261

Browse Source 
* 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
This commit is contained in:
Vasil Dimov 2006-06-06 16:12:48 +00:00
parent efe0ee6196
commit 55a9b9dd37
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=164617
5 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/xaralx-devel/Makefile
View File

@ -5,8 +5,8 @@
# $FreeBSD$
#
PORTVERSION= 0.5r1250
PORTREVISION= 1
PORTVERSION= 0.5r1261
PORTREVISION= 0
PKGNAMESUFFIX= -devel
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2
@ -16,6 +16,7 @@ MASTERDIR= ${.CURDIR}/../xaralx
MD5_FILE= ${.CURDIR}/distinfo
PATCHDIR= ${.CURDIR}/files
EXTRA_PATCHES= ${MASTERDIR}/files/patch-PreComp_Makefile.am
MAKE_ENV= INCLUDES="-I${LOCALBASE}/include/dlmalloc"
.include "${MASTERDIR}/Makefile"

6
graphics/xaralx-devel/distinfo
View File

@ -1,3 +1,3 @@
MD5 (XaraLX-0.5r1250.tar.bz2) = ac939247f9ea84a673bfe40ae9bf7502
SHA256 (XaraLX-0.5r1250.tar.bz2) = 88fa74abc984ef7870c520b96c2265213a4e5f1485dcb20d1272cfa5078b130c
SIZE (XaraLX-0.5r1250.tar.bz2) = 23593964
MD5 (XaraLX-0.5r1261.tar.bz2) = 3658c25f0ac11efb4afbc6fa5b9212db
SHA256 (XaraLX-0.5r1261.tar.bz2) = 8edad7308508aadcb1f931a9dd8fc2c18eaa9700ab092764058a2d30055bdd39
SIZE (XaraLX-0.5r1261.tar.bz2) = 23601846

17
graphics/xaralx-devel/files/patch-configure.in
View File

@ -1,6 +1,6 @@
--- configure.in.orig Mon Jun 5 09:30:36 2006
+++ configure.in Mon Jun 5 10:14:28 2006
@@ -165,7 +165,7 @@
--- configure.in.orig Tue Jun 6 15:00:31 2006
+++ configure.in Tue Jun 6 16:43:23 2006
@@ -173,7 +173,7 @@
if test "$InternationalEnable" = "yes"; then
AC_MSG_CHECKING([wxWidgets wxrc utility])
@ -9,14 +9,3 @@
if test "$WXRC" = "" ; then
AC_MSG_RESULT([not found, disabling international build])
@@ -277,8 +277,8 @@
fi
# pass the Pango, FreeType and GTK flags (required for wxGTK font rendering)
-CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS"
-CXXFLAGS="$CXXFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS"
+CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS $CPPFLAGS_APPEND"
+CXXFLAGS="$CXXFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS $CPPFLAGS_APPEND"
AC_MSG_CHECKING([Linker])
case $host in

16
graphics/xaralx/Makefile
View File

@ -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

2
graphics/xaralx/pkg-plist
View File

@ -1,4 +1,4 @@
bin/XaraLX%%PKGNAMESUFFIX%%
bin/xaralx%%PKGNAMESUFFIX%%
%%DESKTOPDIR%%/xaralx%%PKGNAMESUFFIX%%.desktop
%%PIXMAPSDIR%%/xaralx%%PKGNAMESUFFIX%%.png
%%EXAMPLESDIR%%/Designs/53 Corvette.xar