summaryrefslogtreecommitdiff
path: root/editors/glimmer
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-09-02 19:17:30 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-09-02 19:17:30 +0000
commit316c6b402dca697be401908cbd66b73a4862f859 (patch)
tree4bd5e21202b1dbe8e627f08028739d45b03977db /editors/glimmer
parentUpgrade to 1.7.2. (diff)
Fix the build on recent 5.X and higher as well as make portlint happy.
Notes
Notes: svn path=/head/; revision=117962
Diffstat (limited to 'editors/glimmer')
-rw-r--r--editors/glimmer/Makefile18
1 files changed, 12 insertions, 6 deletions
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
index 317d24dddbe6..8e710bc36d58 100644
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A full featured code editor for GNOME desktop with many advanced features
+COMMENT= A full featured code editor for GNOME with many advanced features
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
@@ -23,13 +23,11 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_PYTHON= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnomelibs gnomeprint gnomevfs
+USE_GNOME= gnomeprefix gnomehack gnomelibs gnomeprint gnomevfs \
+ gnomeprefix
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-regex
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -D_REGEX_H_ -D_REGEX_H" \
- LIBS="-L${LOCALBASE}/lib -lgnuregex"
-CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
.if exists(/usr/lib/libcrypto.a)
PYTHON_LIBS= -lssl -lcrypto
.endif
@@ -38,10 +36,18 @@ PYTHON_LIBS+= -lutil -lreadline -lcrypt -lpython
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 502104
-BROKEN= "Does not compile on FreeBSD >= 5.x"
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I/usr/include/gnu" \
+ LIBS="-L${LOCALBASE}/lib -lgnuregex"
+.else
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D_REGEX_H_ -D_REGEX_H" \
+ LIBS="-L${LOCALBASE}/lib -lgnuregex"
.endif
post-patch:
@${REINPLACE_CMD} -e 's|-lpython|${PYTHON_LIBS}|g' ${WRKSRC}/configure
+.if ${OSVERSION} >= 502104
+ @${REINPLACE_CMD} -e 's|gnuregex\.h|regex.h|' \
+ ${WRKSRC}/src/gtkextext/gtkextext.h
+.endif
.include <bsd.port.post.mk>