Additional library to the JX toolkit. Depends upon ports/19030 and ports/19039 How-To-Repeat: n/a
Following the observations made by Will to ports/19030 diff -ruN libjtoolbar.ORIG/Makefile libjtoolbar/Makefile --- libjtoolbar.ORIG/Makefile Mon Jun 5 14:17:57 2000 +++ libjtoolbar/Makefile Tue Jun 6 00:32:03 2000 @@ -23,11 +23,11 @@ WRKSRC= ${WRKDIR}/JX-1.5.3 -USE_XLIB= yes +USE_X_PREFIX= yes USE_GMAKE= yes MAKE_ENV= JX_INSTALL_ROOT="${PREFIX}/bin" \ JX_LIB_ROOT="${PREFIX}/lib" \ - X11PREFIX="${X11PREFIX}" \ + X11PREFIX="${X11BASE}" \ PORTCFLAGS="${CFLAGS}" \ PORTCXXFLAGS="${CXXFLAGS}" \ PORTINCLUDES="${PORTINCLUDES}" @@ -37,12 +37,8 @@ EXTRALIBFILES_MAKE_FILES="${EXTRALIBFILES_MAKE_FILES}" \ INCLUDEDIR="${INCLUDEDIR}" -# Proper X11R6 Prefix -# Change it, if you need it -X11PREFIX?= ${X11BASE} - # Make environment -PORTINCLUDES= -I${LOCALBASE}/include/jx -I${LOCALBASE}/include/jtree +PORTINCLUDES= -I${X11BASE}/include/jx -I${X11BASE}/include/jtree # Installs dir with proper permissions INSTALL_DATA_DIR= ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 diff -ruN libjtoolbar.ORIG/pkg/PLIST libjtoolbar/pkg/PLIST --- libjtoolbar.ORIG/pkg/PLIST Sun Jun 4 16:30:06 2000 +++ libjtoolbar/pkg/PLIST Tue Jun 6 00:32:11 2000 @@ -19,5 +19,5 @@ @dirrm share/jx/jtoolbar %%PORTDOCS:%%@dirrm share/doc/JX @dirrm include/%%INCLUDEDIR%% -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@exec /sbin/ldconfig -m %B +@unexec /sbin/ldconfig -R
Responsible Changed From-To: freebsd-ports->will This one's also mine.
Hopefully, the last patch to this PR. Following Will's suggestion to ports/19030. diff -urN libjtoolbar.orig/Makefile libjtoolbar/Makefile --- libjtoolbar.orig/Makefile Tue Jun 6 00:32:03 2000 +++ libjtoolbar/Makefile Wed Jun 7 01:22:23 2000 @@ -25,6 +25,7 @@ USE_X_PREFIX= yes USE_GMAKE= yes +MAKE_ARGS= CC="${CC}" CXX="${CXX}" MAKE_ENV= JX_INSTALL_ROOT="${PREFIX}/bin" \ JX_LIB_ROOT="${PREFIX}/lib" \ X11PREFIX="${X11BASE}" \ @@ -49,7 +50,7 @@ # header files INCLUDEDIR= jtoolbar # documentation -DOCDIR_PREFIX= ${PREFIX}/share/doc/JX +DOCDIR_PREFIX= ${PREFIX}/share/doc/jx DOCDIRS= ${PORTNAME} DOCDIRFILES= LICENSE # xpm images @@ -61,7 +62,7 @@ EXTRALIBFILES_MAKE_WRKSRC= include/make EXTRALIBFILES_MAKE_FILES= jtoolbar_constants # main jx distribution port wrksrc -JXPORT= ${PORTSDIR}/x11-toolkits/JX +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 @@ -99,7 +100,8 @@ 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) diff -urN libjtoolbar.orig/pkg/PLIST libjtoolbar/pkg/PLIST --- libjtoolbar.orig/pkg/PLIST Tue Jun 6 00:32:11 2000 +++ libjtoolbar/pkg/PLIST Wed Jun 7 01:22:41 2000 @@ -11,13 +11,13 @@ lib/%%PORTNAME%%-%%LIBVERSION%%.a lib/%%PORTNAME%%-%%LIBVERSION%%.so lib/%%PORTNAME%%-%%LIBVERSION%%.so.%%LIBNUMBER%% -%%PORTDOCS:%%share/doc/JX/LICENSE_%%PORTNAME%% +%%PORTDOCS:%%share/doc/jx/LICENSE_%%PORTNAME%% share/jx/jtoolbar/itemchecked.xpm share/jx/jtoolbar/itemnotchecked.xpm share/jx/jtoolbar/menunode.xpm share/jx/jtoolbar/todonotdone.xpm @dirrm share/jx/jtoolbar -%%PORTDOCS:%%@dirrm share/doc/JX +%%PORTDOCS:%%@dirrm share/doc/jx @dirrm include/%%INCLUDEDIR%% @exec /sbin/ldconfig -m %B @unexec /sbin/ldconfig -R
State Changed From-To: open->closed Committed, thanks!