aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--textproc/raptor/Makefile21
-rw-r--r--textproc/raptor/distinfo2
-rw-r--r--textproc/raptor/pkg-plist1
-rw-r--r--textproc/raptor2/Makefile21
-rw-r--r--textproc/raptor2/distinfo2
-rw-r--r--textproc/raptor2/pkg-plist1
6 files changed, 20 insertions, 28 deletions
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index b8e2468f55d9..de1e7e2a020c 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= raptor
-PORTVERSION= 0.9.9
+PORTVERSION= 0.9.10
PORTREVISION= 0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
@@ -21,22 +21,17 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
xmlparse.1:${PORTSDIR}/www/libwww \
curl.2:${PORTSDIR}/ftp/curl
-LIBWWW_CONFIG= ${LOCALBASE}/bin/libwww-config
-
+USE_GETOPT_LONG= yes
+USE_GNOME= gnomehack
USE_LIBTOOL= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS= --with-xml-parser=libxml
+CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \
+ --with-curl-config=${LOCALBASE}/bin/curl-config \
+ --with-libwww-config=${LOCALBASE}/bin/libwww-config \
+ --with-pkg-config=${LOCALBASE}/bin/pkg-config \
+ --with-xml-parser=libxml
INSTALLS_SHLIB= yes
MAN1= rapper.1 raptor-config.1
MAN3= libraptor.3
-CPPFLAGS= -I${LOCALBASE}/include `${LIBWWW_CONFIG} --cflags`
-LDFLAGS= -L${LOCALBASE}/lib `${LIBWWW_CONFIG} --libs`
-
-.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS+= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-LDFLAGS+= -lgnugetopt
-.endif
-
.include <bsd.port.mk>
diff --git a/textproc/raptor/distinfo b/textproc/raptor/distinfo
index 5caee926d315..ffcfef9dd756 100644
--- a/textproc/raptor/distinfo
+++ b/textproc/raptor/distinfo
@@ -1 +1 @@
-MD5 (raptor-0.9.9.tar.gz) = bc30679d5bb225dcd80847de3d0eceab
+MD5 (raptor-0.9.10.tar.gz) = 7c4a3b7fb9f3df3de0430cbcf022d1bc
diff --git a/textproc/raptor/pkg-plist b/textproc/raptor/pkg-plist
index 5c26a412d15d..90adc85e4da7 100644
--- a/textproc/raptor/pkg-plist
+++ b/textproc/raptor/pkg-plist
@@ -5,3 +5,4 @@ include/raptor.h
lib/libraptor.a
lib/libraptor.so
lib/libraptor.so.0
+libdata/pkgconfig/raptor.pc
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index b8e2468f55d9..de1e7e2a020c 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= raptor
-PORTVERSION= 0.9.9
+PORTVERSION= 0.9.10
PORTREVISION= 0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
@@ -21,22 +21,17 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
xmlparse.1:${PORTSDIR}/www/libwww \
curl.2:${PORTSDIR}/ftp/curl
-LIBWWW_CONFIG= ${LOCALBASE}/bin/libwww-config
-
+USE_GETOPT_LONG= yes
+USE_GNOME= gnomehack
USE_LIBTOOL= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS= --with-xml-parser=libxml
+CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \
+ --with-curl-config=${LOCALBASE}/bin/curl-config \
+ --with-libwww-config=${LOCALBASE}/bin/libwww-config \
+ --with-pkg-config=${LOCALBASE}/bin/pkg-config \
+ --with-xml-parser=libxml
INSTALLS_SHLIB= yes
MAN1= rapper.1 raptor-config.1
MAN3= libraptor.3
-CPPFLAGS= -I${LOCALBASE}/include `${LIBWWW_CONFIG} --cflags`
-LDFLAGS= -L${LOCALBASE}/lib `${LIBWWW_CONFIG} --libs`
-
-.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS+= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-LDFLAGS+= -lgnugetopt
-.endif
-
.include <bsd.port.mk>
diff --git a/textproc/raptor2/distinfo b/textproc/raptor2/distinfo
index 5caee926d315..ffcfef9dd756 100644
--- a/textproc/raptor2/distinfo
+++ b/textproc/raptor2/distinfo
@@ -1 +1 @@
-MD5 (raptor-0.9.9.tar.gz) = bc30679d5bb225dcd80847de3d0eceab
+MD5 (raptor-0.9.10.tar.gz) = 7c4a3b7fb9f3df3de0430cbcf022d1bc
diff --git a/textproc/raptor2/pkg-plist b/textproc/raptor2/pkg-plist
index 5c26a412d15d..90adc85e4da7 100644
--- a/textproc/raptor2/pkg-plist
+++ b/textproc/raptor2/pkg-plist
@@ -5,3 +5,4 @@ include/raptor.h
lib/libraptor.a
lib/libraptor.so
lib/libraptor.so.0
+libdata/pkgconfig/raptor.pc