Re: pkg/37855: comms/jpilot does not compile on Darwin

[Brian de Alwis <bsd%cs.ubc.ca@localhost>]

On 23-Jan-2008, at 2:30 PM, Joerg Sonnenberger wrote:
> On Wed, Jan 23, 2008 at 08:20:00PM +0000, bsd%cs.ubc.ca@localhost wrote:
> > Fix 2. The Makefile explicitly sets LDFLAGS=-export-dynamic which is
> > not supported on Darwin/Mac OS X.
>
> Package should use EXPORT_SYMBOLS_LDFLAGS here.


Ah, thanks for that.  I've respun the patch; not sure if the  
<bsd.prefs.mk> is still necessary?

=== modified file 'comms/jpilot/Makefile'
--- comms/jpilot/Makefile       2008-01-09 15:38:08 +0000
+++ comms/jpilot/Makefile       2008-01-23 21:41:54 +0000
@@ -16,13 +16,17 @@
 USE_PKGLOCALEDIR=      YES
 USE_OLD_DES_API=       YES
 USE_DIRS+=             xdg-1.4
-USE_TOOLS+=            intltool msgfmt pkg-config
+USE_TOOLS+=            intltool msgfmt pkg-config gmake
 USE_LANGUAGES+=                c

 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --with-gtk-prefix="${BUILDLINK_PREFIX.gtk2}"
 CONFIGURE_ARGS+=	--with-pilot-prefix="${BUILDLINK_PREFIX.pilot-link- 
libs}"
-LDFLAGS+=              -export-dynamic
+
+.include "../../mk/bsd.prefs.mk"
+
+# Ensure we export symbols in the linked shared object.
+LDFLAGS+=              ${EXPORT_SYMBOLS_LDFLAGS}

 DOCDIR=                        ${PREFIX}/share/doc/jpilot
 INCDIR=                        ${PREFIX}/include/jpilot
@@ -48,7 +52,7 @@
        ${INSTALL_DATA_DIR} ${DOCDIR}
        ${INSTALL_DATA_DIR} ${INCDIR}
        ${INSTALL_DATA_DIR} ${PLUGINSDIR}
-       cd ${WRKSRC}; ${INSTALL_DATA} libplugin.h prefs.h ${INCDIR}
+       cd ${WRKSRC}; ${INSTALL_DATA} config.h libplugin.h prefs.h ${INCDIR}
        ${INSTALL_DATA} ${WRKSRC}/BUGS ${DOCDIR}
        cd ${WRKSRC}/docs; ${INSTALL_MAN} *.1 ${MAN1DIR}
        ${TOUCH} ${PLUGINSDIR}/.directory

=== modified file 'comms/jpilot/PLIST'
--- comms/jpilot/PLIST  2008-01-09 15:38:08 +0000
+++ comms/jpilot/PLIST  2008-01-23 19:59:16 +0000
@@ -2,6 +2,7 @@
 bin/jpilot
 bin/jpilot-dump
 bin/jpilot-sync
+include/jpilot/config.h
 include/jpilot/libplugin.h
 include/jpilot/prefs.h
 lib/jpilot/plugins/.directory


--
 Brian de Alwis | Software Practices Lab | UBC | http://www.cs.ubc.ca/~bsd/
      "Amusement to an observing mind is study." - Benjamin Disraeli