aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/libjtoolbar/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/libjtoolbar/Makefile')
-rw-r--r--x11-toolkits/libjtoolbar/Makefile34
1 files changed, 18 insertions, 16 deletions
diff --git a/x11-toolkits/libjtoolbar/Makefile b/x11-toolkits/libjtoolbar/Makefile
index 95bda59224ca..987f68d421e6 100644
--- a/x11-toolkits/libjtoolbar/Makefile
+++ b/x11-toolkits/libjtoolbar/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libjtoolbar
PORTVERSION= 0.5.4
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.newplanetsoftware.com/pub/jx/source-1.5.3/ \
ftp://ftp.newplanetsoftware.com/pub/jcc/source/ \
@@ -16,33 +17,29 @@ DISTNAME= JToolBar_source-${PORTVERSION}
MAINTAINER= lioux@linf.unb.br
-BUILD_DEPENDS= nonexistent:${JXPORT}:patch
+BUILD_DEPENDS= nonexistent:${JXPORT}:configure \
+ makemake:${JXPORT}
LIB_DEPENDS= jx-1_5_3.1:${JXPORT} \
jtree-1_1_7.1:${PORTSDIR}/x11-toolkits/libjtree
WRKSRC= ${WRKDIR}/JX-1.5.3
-USE_XLIB= yes
+USE_X_PREFIX= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+MAKE_ARGS= CC="${CC}" CXX="${CXX}" \
+ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
MAKE_ENV= JX_INSTALL_ROOT="${PREFIX}/bin" \
- JX_LIB_ROOT="${PREFIX}/lib" \
- X11PREFIX="${X11PREFIX}" \
- PORTCFLAGS="${CFLAGS}" \
- PORTCXXFLAGS="${CXXFLAGS}" \
- PORTINCLUDES="${PORTINCLUDES}"
+ JX_LIB_ROOT="${PREFIX}/lib"
PLIST_SUB= PORTNAME="${PORTNAME}" \
LIBNUMBER="${LIBNUMBER}" \
LIBVERSION="${LIBVERSION}" \
EXTRALIBFILES_MAKE_FILES="${EXTRALIBFILES_MAKE_FILES}" \
INCLUDEDIR="${INCLUDEDIR}"
-
-# Proper X11R6 Prefix
-# Change it, if you need it
-X11PREFIX?= ${X11BASE}
+INSTALLS_SHLIB= yes
# Make environment
-PORTINCLUDES= -I${LOCALBASE}/include/jx -I${LOCALBASE}/include/jtree
+PORTINCLUDES= -I${X11BASE}/include/jx -I${X11BASE}/include/jtree \
+ -I${X11BASE}/include/jcore
# Installs dir with proper permissions
INSTALL_DATA_DIR= ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755
@@ -53,7 +50,7 @@ LIBFILES= ${PORTNAME}-${LIBVERSION}.a ${PORTNAME}-${LIBVERSION}.so
# header files
INCLUDEDIR= jtoolbar
# documentation
-DOCDIR_PREFIX= ${PREFIX}/share/doc/JX
+DOCDIR_PREFIX= ${PREFIX}/share/doc/jx
DOCDIRS= ${PORTNAME}
DOCDIRFILES= LICENSE
# xpm images
@@ -68,7 +65,7 @@ EXTRALIBFILES_MAKE_FILES= jtoolbar_constants
JXPORT= ${PORTSDIR}/x11-toolkits/jx
JXPORT_WRKSRC= ${JXPORT}/work/JX-1.5.3
# main jx distribution files needed for building
-COPY_JXDIRS= include lib libjcore
+COPY_JXDIRS= include
COPY_JXFILES= Makefile
JX_MAKE_CONSTANTS= jtree_constants
@@ -96,6 +93,10 @@ post-extract:
@${CP} -p ${JXPORT_WRKSRC}/${i} ${WRKSRC}
.endfor
+post-patch:
+ @${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
+ ${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
+
pre-build:
.for i in ${JX_MAKE_CONSTANTS}
@${LN} -sf ${EXTRALIB_PREFIX}/make/${i} ${WRKSRC}/include/make
@@ -103,7 +104,8 @@ pre-build:
post-build:
@cd ${WRKSRC}/${PORTNAME}; ${SETENV} ${MAKE_ENV} makemake; \
- ${SETENV} ${MAKE_ENV} ${GMAKE}
+ ${SETENV} ${MAKE_ENV} ${GMAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
do-install:
.if !defined(NOPORTDOCS)