Fix packaging when OSPFAPI is requested. This installs additional headers,

and an additional directory.

Use the PLIST_SUB mechanism to achieve this rather than rewriting the entire
pkg-plist; if more sweeping additions are required we can do this later. The
smoke-and-mirrors going on here mean that we have to keep Makefile.inc around
in the WRKDIR until the install step, so that the pkg-plist can be substituted.

Keep the pkg-plist sort -r'd to avoid churn on future changes.

Noticed by:	kris

2 files changed, 70 insertions, 65 deletions

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index c7a92673311d..3fb211ae1faf 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -39,6 +39,14 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+.if ${CONFIGURE_ARGS:M--enable-opaque-lsa} != ""
+PLIST_SUB+=	OSPFAPI_HEADER="include/quagga/ospfapi/ospf_apiclient.h"
+PLIST_SUB+=	OSPFAPI_PATH="@dirrm include/quagga/ospfapi"
+.else
+PLIST_SUB+=	OSPFAPI_HEADER=
+PLIST_SUB+=	OSPFAPI_PATH=
+.endif
+
 .if !defined(ENABLE_USER)
 ENABLE_USER=quagga
 .endif
@@ -86,9 +94,6 @@ pre-everything::
 	@${ECHO} "   TCPSOCKETS       Use TCP/IP sockets for protocol daemons"
 
 pre-configure:
-.if !defined(BATCH)
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-.endif
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} )
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOHEADER_ENV} ${AUTOHEADER} \
 		${AUTOHEADER_ARGS})
diff --git a/net/quagga/pkg-plist b/net/quagga/pkg-plist
index 2368796e569a..617869667558 100644
--- a/net/quagga/pkg-plist
+++ b/net/quagga/pkg-plist
@@ -1,70 +1,70 @@
-sbin/bgpd
-sbin/ospf6d
-sbin/ospfd
-sbin/ripd
-sbin/ripngd
-sbin/zebra
 sbin/zebractl
-bin/vtysh
-etc/quagga/bgpd.conf.sample
-etc/quagga/bgpd.conf.sample2
-etc/quagga/ospf6d.conf.sample
-etc/quagga/ospfd.conf.sample
-etc/quagga/ripd.conf.sample
-etc/quagga/ripngd.conf.sample
-etc/quagga/vtysh.conf.sample
-etc/quagga/zebra.conf.sample
-@dirrm etc/quagga
-include/quagga/ospfd/ospf_api.h
-include/quagga/ospfd/ospf_asbr.h
-include/quagga/ospfd/ospf_dump.h
-include/quagga/ospfd/ospf_ism.h
-include/quagga/ospfd/ospf_lsa.h
-include/quagga/ospfd/ospf_lsdb.h
-include/quagga/ospfd/ospf_nsm.h
-include/quagga/ospfd/ospf_opaque.h
-include/quagga/ospfd/ospfd.h
-@dirrm include/quagga/ospfd
-include/quagga/ospfapi/ospf_apiclient.h  
-@dirrm include/quagga/ospfapi
-include/quagga/buffer.h 
-include/quagga/if.h
-include/quagga/network.h
-include/quagga/sockopt.h
-include/quagga/version.h
-include/quagga/command.h
-include/quagga/if_rmap.h
-include/quagga/sockunion.h
-include/quagga/vty.h
-include/quagga/debug.h
-include/quagga/keychain.h      
-include/quagga/plist.h         
-include/quagga/str.h           
+sbin/zebra
+sbin/ripngd
+sbin/ripd
+sbin/ospfd
+sbin/ospf6d
+sbin/bgpd
+lib/libzebra.a
+lib/libospf.a
+info/quagga.info-4
+info/quagga.info-3
+info/quagga.info-2
+info/quagga.info-1
+info/quagga.info
+include/quagga/zebra.h
 include/quagga/zclient.h
-include/quagga/distribute.h    
-include/quagga/linklist.h      
-include/quagga/prefix.h        
+include/quagga/vty.h
+include/quagga/version.h
+include/quagga/vector.h
+include/quagga/thread.h
+include/quagga/table.h
 include/quagga/stream.h        
-include/quagga/zebra.h
-include/quagga/filter.h
-include/quagga/log.h
+include/quagga/str.h           
+include/quagga/sockunion.h
+include/quagga/sockopt.h
+include/quagga/smux.h
+include/quagga/routemap.h 
 include/quagga/privs.h
-include/quagga/table.h
-include/quagga/getopt.h
+include/quagga/prefix.h        
+include/quagga/plist.h         
+include/quagga/ospfd/ospfd.h
+include/quagga/ospfd/ospf_opaque.h
+include/quagga/ospfd/ospf_nsm.h
+include/quagga/ospfd/ospf_lsdb.h
+include/quagga/ospfd/ospf_lsa.h
+include/quagga/ospfd/ospf_ism.h
+include/quagga/ospfd/ospf_dump.h
+include/quagga/ospfd/ospf_asbr.h
+include/quagga/ospfd/ospf_api.h
+include/quagga/network.h
+include/quagga/memory.h
 include/quagga/md5-gnu.h
-include/quagga/routemap.h 
-include/quagga/thread.h
+include/quagga/log.h
+include/quagga/linklist.h      
+include/quagga/keychain.h      
+include/quagga/if_rmap.h
+include/quagga/if.h
 include/quagga/hash.h
-include/quagga/memory.h
-include/quagga/smux.h
-include/quagga/vector.h
-@dirrm include/quagga
-lib/libospf.a
-lib/libzebra.a
+include/quagga/getopt.h
+include/quagga/filter.h
+include/quagga/distribute.h    
+include/quagga/debug.h
+include/quagga/command.h
+include/quagga/buffer.h 
+etc/quagga/zebra.conf.sample
+etc/quagga/vtysh.conf.sample
+etc/quagga/ripngd.conf.sample
+etc/quagga/ripd.conf.sample
+etc/quagga/ospfd.conf.sample
+etc/quagga/ospf6d.conf.sample
+etc/quagga/bgpd.conf.sample2
+etc/quagga/bgpd.conf.sample
+bin/vtysh
 @unexec install-info --delete %D/info/quagga.info %D/info/dir
-info/quagga.info
-info/quagga.info-1
-info/quagga.info-2
-info/quagga.info-3
-info/quagga.info-4
 @exec install-info %D/info/quagga.info %D/info/dir
+@dirrm include/quagga/ospfd
+%%OSPFAPI_HEADER%%
+%%OSPFAPI_PATH%%
+@dirrm include/quagga
+@dirrm etc/quagga