aboutsummaryrefslogtreecommitdiffstats
path: root/net/quagga
diff options
context:
space:
mode:
authorade <ade@FreeBSD.org>2006-02-23 18:40:44 +0800
committerade <ade@FreeBSD.org>2006-02-23 18:40:44 +0800
commitda880765886f48c0ac8fd253e5601d04ea853215 (patch)
tree55155f50e8a40ea2e2a16e2331e8cbb919b7d04f /net/quagga
parentba4beb1ea11e6147a9b30969be42685d1c709e56 (diff)
downloadfreebsd-ports-gnome-da880765886f48c0ac8fd253e5601d04ea853215.tar.gz
freebsd-ports-gnome-da880765886f48c0ac8fd253e5601d04ea853215.tar.zst
freebsd-ports-gnome-da880765886f48c0ac8fd253e5601d04ea853215.zip
Conversion to a single libtool environment.
Approved by: portmgr (kris)
Diffstat (limited to 'net/quagga')
-rw-r--r--net/quagga/Makefile23
-rw-r--r--net/quagga/pkg-plist19
2 files changed, 16 insertions, 26 deletions
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index a6735984e9d7..0522d28fdaa3 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -7,7 +7,7 @@
PORTNAME= quagga
PORTVERSION= 0.99.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net ipv6
MASTER_SITES= http://quagga.net/download/
@@ -24,7 +24,6 @@ USE_GMAKE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_PERL5_BUILD= yes
-USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure
MAN1= vtysh.1
@@ -80,11 +79,9 @@ SCRIPTS_ENV= PREFIX=${PREFIX} PKG_PREFIX=${PREFIX} \
.if defined(WITH_ISISD) && !defined(WITHOUT_ISISD)
CONFIGURE_ARGS+=--enable-isisd
-PLIST_SUB+= ISISD_SBIN=sbin/isisd
-PLIST_SUB+= ISISD_CONF=%%EXAMPLESDIR%%/isisd.conf.sample
+PLIST_SUB+= ISISD=""
.else
-PLIST_SUB+= ISISD_SBIN="@comment"
-PLIST_SUB+= ISISD_CONF="@comment"
+PLIST_SUB+= ISISD="@comment "
.endif
MAN8+= isisd.8
@@ -98,19 +95,9 @@ CONFIGURE_ARGS+=--enable-nssa
.if defined(WITH_OSPF_OPAQUE_LSA) && !defined(WITHOUT_OSPF_OPAQUE_LSA)
CONFIGURE_ARGS+=--enable-opaque-lsa
-PLIST_SUB+= OSPFAPI_HEADER="include/quagga/ospfapi/ospf_apiclient.h"
-PLIST_SUB+= OSPFAPI_PATH="@dirrm include/quagga/ospfapi"
-PLIST_SUB+= OSPFAPI_LIBA="lib/libospfapiclient.a"
-PLIST_SUB+= OSPFAPI_LIBSO="lib/libospfapiclient.so"
-PLIST_SUB+= OSPFAPI_LIBSO0="lib/libospfapiclient.so.0"
-PLIST_SUB+= OSPFAPI_SBIN="sbin/ospfclient"
+PLIST_SUB+= OSPFAPI=""
.else
-PLIST_SUB+= OSPFAPI_HEADER="@comment"
-PLIST_SUB+= OSPFAPI_PATH="@comment"
-PLIST_SUB+= OSPFAPI_LIBA="@comment"
-PLIST_SUB+= OSPFAPI_LIBSO="@comment"
-PLIST_SUB+= OSPFAPI_LIBSO0="@comment"
-PLIST_SUB+= OSPFAPI_SBIN="@comment"
+PLIST_SUB+= OSPFAPI="@comment "
.endif
.if defined(WITH_RTADV) && !defined(WITHOUT_RTADV)
diff --git a/net/quagga/pkg-plist b/net/quagga/pkg-plist
index 3a5e7ed2098d..fd561764c545 100644
--- a/net/quagga/pkg-plist
+++ b/net/quagga/pkg-plist
@@ -1,7 +1,7 @@
sbin/bgpd
-%%ISISD_SBIN%%
+%%ISISD%%sbin/isisd
sbin/ospf6d
-%%OSPFAPI_SBIN%%
+%%OSPFAPI%%sbin/ospfclient
sbin/ospfd
sbin/ripd
sbin/ripngd
@@ -9,12 +9,15 @@ sbin/watchquagga
sbin/zebra
bin/vtysh
lib/libospf.a
+lib/libospf.la
lib/libospf.so
lib/libospf.so.0
-%%OSPFAPI_LIBA%%
-%%OSPFAPI_LIBSO%%
-%%OSPFAPI_LIBSO0%%
+%%OSPFAPI%%lib/libospfapiclient.a
+%%OSPFAPI%%lib/libospfapiclient.la
+%%OSPFAPI%%lib/libospfapiclient.so
+%%OSPFAPI%%lib/libospfapiclient.so.0
lib/libzebra.a
+lib/libzebra.la
lib/libzebra.so
lib/libzebra.so.0
include/quagga/buffer.h
@@ -34,7 +37,7 @@ include/quagga/md5.h
include/quagga/memory.h
include/quagga/memtypes.h
include/quagga/network.h
-%%OSPFAPI_HEADER%%
+%%OSPFAPI%%include/quagga/ospfapi/ospf_apiclient.h
include/quagga/ospfd/ospf_api.h
include/quagga/ospfd/ospf_asbr.h
include/quagga/ospfd/ospf_dump.h
@@ -66,15 +69,15 @@ include/quagga/zclient.h
include/quagga/zebra.h
%%EXAMPLESDIR%%/bgpd.conf.sample
%%EXAMPLESDIR%%/bgpd.conf.sample2
-%%ISISD_CONF%%
+%%ISISD%%%%EXAMPLESDIR%%/isisd.conf.sample
%%EXAMPLESDIR%%/ospf6d.conf.sample
%%EXAMPLESDIR%%/ospfd.conf.sample
%%EXAMPLESDIR%%/ripd.conf.sample
%%EXAMPLESDIR%%/ripngd.conf.sample
%%EXAMPLESDIR%%/vtysh.conf.sample
%%EXAMPLESDIR%%/zebra.conf.sample
-%%OSPFAPI_PATH%%
@dirrm include/quagga/ospfd
+%%OSPFAPI%%@dirrm include/quagga/ospfapi
@dirrm include/quagga
@dirrm share/examples/quagga
@dirrm etc/quagga