On 2019/03/03 14:53, Stefan Sperling wrote:
> This is a port of textsuggest, a software which suggests words similar
> to that which the user has just typed, and inserts the chosen corrected
> word on behalf of the user. It works with any X11 application.
> 
> This port is functional but there are likely still some bugs.
> The port contains quite a few patches already to fix various issues.
> I am porting this for a friend who has great difficulty typing on a computer
> and I will keep trying to fix bugs in this program as we run into them.
> 
> ok?

Here's a diff on top to remove some boilerplate from the Makefile and
remove the "exec ${_PBUILD}" which isn't needed (it's done automatically
by _PMAKE) and breaks the build if you're using PORTS_PRIVSEP.

Linking fails for me though:

clang++ -pthread -Wl,-rpath,/usr/X11R6/lib -Wl,-rpath,/usr/local/lib/qt5  -o 
textsuggest EventCatcherEntry.o  textsuggest-ui.o  TextSugge
stApp.o  moc_EventCatcherEntry.o  moc_TextSuggestApp.o   -ldbus-c++-1 
-L/usr/local/lib/qt5 -lQt5Widgets -L/usr/local/lib -L/usr/X11R6/lib
 -lQt5Gui -lQt5Core -lGL 
-L/usr/obj/ports/textsuggest-4.2.0/TextSuggest-v4.2.0/ui
ld: error: undefined symbol: 
DBus::InterfaceProxy::InterfaceProxy(std::__1::basic_string<char, 
std::__1::char_traits<char>, std::__1::all
ocator<char> > const&)
>>> referenced by textsuggest-ui.cpp
>>>               
>>> textsuggest-ui.o:(org::textsuggest::server_proxy::server_proxy())



diff --git Makefile Makefile
index 2f45d77..05b8a2f 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =      auto-complete and text expansion in X11
 
-V=4.2.0
+V =            4.2.0
 DISTNAME =     TextSuggest-v${V}
 PKGNAME =      textsuggest-${V}
 CATEGORIES =   x11
@@ -14,15 +14,14 @@ MAINTAINER =        Stefan Sperling <[email protected]>
 # GPLv3
 PERMIT_PACKAGE_CDROM = Yes
 
-# "make port-lib-depends-check" can help
 WANTLIB =              c ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Widgets \
                        dbus-c++-1 m xcb
 
 MASTER_SITES =         
https://gitlab.com/bharadwaj-raju/TextSuggest/-/archive/v${V}/
 
 MODULES =              x11/qt5
-#BUILD_DEPENDS =       ???
-RUN_DEPENDS =          x11/xclip x11/xdotool
+RUN_DEPENDS =          x11/xclip \
+                       x11/xdotool
 LIB_DEPENDS =          x11/libdbus-c++
 
 CXXFLAGS =             -std=c++11 \
@@ -30,33 +29,7 @@ CXXFLAGS =           -std=c++11 \
                        -I${LOCALBASE}/include/dbus-c++-1
 LDFLAGS =              -L${X11BASE}/lib -L${PREFIX}/lib -lxcb -ldbus-c++-1
 
-#MAKE_FLAGS =          ???
-#MAKE_ENV =            ???
-#FAKE_FLAGS =          ???
-#TEST_FLAGS =          ???
-
-# build/configuration variables
-#
 SEPARATE_BUILD =       No
-#SEPARATE_BUILD =      flavored (distinct flavors may share a common WRKSRC)
-#USE_GMAKE =           Yes
-#USE_GROFF =           Yes
-# Programs that require GNU libtool to build instead of the OpenBSD one
-# should use this option. Add a comment explaining why. Don't use this if
-# a port requires libtool's .m4 files but otherwise can use OpenBSD libtool,
-# in that case use "BUILD_DEPENDS=devel/libtool" instead.
-#USE_LIBTOOL=          gnu
-# Set CONFIGURE_STYLE to value corresponding to some standard configuration
-#        perl [modbuild]: perl's MakeMaker Makefile.PL (modbuild: perl's
-#        Module::Build Build.PL)
-#        gnu [autoconf] [old] [dest]: gnu style configure (old: no
-#        sysconfdir), (dest: add DESTDIR, does not handle it),
-#        (autoconf: needed by port, implies gnu)
-#      XXX: cygnus products do NOT use autoconf for making the main
-#              configure from configure.in
-#        imake [noman]: port uses imake for configuration.
-#        (noman: no man page installation)
-#        simple: port has its own configure script
 CONFIGURE_STYLE =      none
 
 pre-configure:
@@ -69,16 +42,15 @@ TEXTSUGGEST_SERVER_SRC = textsuggest-server.cpp \
        ../lib/clip/clip_x11.cpp
 
 do-build:
-       cd ${WRKBUILD}/ui && exec ${_PBUILD} ${SETENV} ${MAKE_ENV} \
-               ${MODQT_QMAKE} -makefile 
-       cd ${WRKBUILD}/ui && exec ${_PBUILD} ${SETENV} ${MAKE_ENV} \
+       cd ${WRKBUILD}/ui && ${SETENV} ${MAKE_ENV} ${MODQT_QMAKE} -makefile
+       cd ${WRKBUILD}/ui && ${SETENV} ${MAKE_ENV} \
                ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${ALL_TARGET}
-       cd ${WRKBUILD}/server && exec ${_PBUILD} ${SETENV} ${MAKE_ENV} \
+       cd ${WRKBUILD}/server && ${SETENV} ${MAKE_ENV} \
                ${CXX} ${CFLAGS} ${CXXFLAGS} ${LDFLAGS} \
                ${TEXTSUGGEST_SERVER_SRC} -o textsuggest-server
 .for processor in command math_expression
        cd ${WRKBUILD}/textsuggest/processors/ && \
-               exec ${_PBUILD} ${SETENV} ${MAKE_ENV} \
+               ${SETENV} ${MAKE_ENV} \
                ${CXX} ${CFLAGS} ${CXXFLAGS} ${LDFLAGS} \
                ${processor}.cpp -o ${processor}
 .endfor

Reply via email to