diff -urN /usr/ports/print/panda/Makefile print/panda/Makefile
--- /usr/ports/print/panda/Makefile Sun Mar 14 18:17:12 2004
+++ print/panda/Makefile Fri Apr 16 01:15:03 2004
@@ -6,30 +6,33 @@
#
PORTNAME= panda
-PORTVERSION= 0.5.3
-PORTREVISION= 1
+PORTVERSION= 0.5.4
CATEGORIES= print
-MASTER_SITES= http://www.stillhq.com/panda/source/
-DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}
-EXTRACT_SUFX= .tgz
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+ ${MASTER_SITE_SAVANNAH} \
+ http://www.stillhq.com/panda/source/
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-COMMENT= A GPL PDF generation library
+COMMENT= A PDF generation library
-LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS= db41.1:${PORTSDIR}/databases/db41 \
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USE_REINPLACE= yes
+USE_BZIP2= yes
+USE_GNOME= gnomehack gnometarget lthack pkgconfig
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+USE_LIBTOOL_VER= 13
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS= --enable-berkeley-db
INSTALLS_SHLIB= yes
+CPPFLAGS= -I${LOCALBASE}/include/db41 -I${LOCALBASE}/include \
+ ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
.include <bsd.port.pre.mk>
post-extract:
@@ -38,7 +41,7 @@
.endfor
post-patch:
- @${REINPLACE_CMD} -e 's| -lpanda| \$$(top_srcdir)/libpanda.la|g' \
+ @${REINPLACE_CMD} -e 's| -lpanda| $$(top_srcdir)/libpanda.la|g' \
${WRKSRC}/examples/Makefile.in
post-install:
diff -urN /usr/ports/print/panda/Makefile.man print/panda/Makefile.man
--- /usr/ports/print/panda/Makefile.man Tue Jul 1 17:17:34 2003
+++ print/panda/Makefile.man Fri Apr 16 01:19:47 2004
@@ -31,7 +31,6 @@
MAN3+= panda_hidewindowui.3
MAN3+= panda_imagebox.3
MAN3+= panda_imageboxrot.3
-MAN3+= panda_imagesize.3
MAN3+= panda_init.3
MAN3+= panda_insertJPEG.3
MAN3+= panda_insertPNG.3
diff -urN /usr/ports/print/panda/distinfo print/panda/distinfo
--- /usr/ports/print/panda/distinfo Thu Mar 18 13:56:22 2004
+++ print/panda/distinfo Fri Apr 16 00:09:41 2004
@@ -1,2 +1,2 @@
-MD5 (panda_0_5_3.tgz) = f91bce35f2dbc827399f91b893ca717d
-SIZE (panda_0_5_3.tgz) = 2490488
+MD5 (panda-0.5.4.tar.bz2) = 565eac0cd99df67e65ce6ad7f3c371bf
+SIZE (panda-0.5.4.tar.bz2) = 2288345
diff -urN /usr/ports/print/panda/files/patch-configure print/panda/files/patch-configure
--- /usr/ports/print/panda/files/patch-configure Tue Jul 1 15:49:30 2003
+++ print/panda/files/patch-configure Fri Apr 16 01:07:29 2004
@@ -1,10 +1,38 @@
---- configure.orig Fri May 16 13:21:40 2003
-+++ configure Sat May 17 21:37:09 2003
-@@ -7860,6 +7860,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+--- configure.orig Tue Apr 13 09:47:26 2004
++++ configure Fri Apr 16 01:07:19 2004
+@@ -8983,7 +8983,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldb $LIBS"
++LIBS="-ldb41 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -9042,7 +9042,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_db_db_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_db_db_create" >&6
+ if test $ac_cv_lib_db_db_create = yes; then
+- LDFLAGS="$LDFLAGS -ldb" DATABASE="db"
++ LDFLAGS="$LDFLAGS -ldb41" DATABASE="db"
+ else
+ echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6
+@@ -9142,7 +9142,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldb $LIBS"
++LIBS="-ldb41 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -9201,7 +9201,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_db_db_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_db_db_create" >&6
+ if test $ac_cv_lib_db_db_create = yes; then
+- LDFLAGS="$LDFLAGS -ldb" DATABASE="db"
++ LDFLAGS="$LDFLAGS -ldb41" DATABASE="db"
+ cat >>confdefs.h <<\_ACEOF
+ #define USE_DB
+ _ACEOF
diff -urN /usr/ports/print/panda/files/patch-database.c print/panda/files/patch-database.c
--- /usr/ports/print/panda/files/patch-database.c Thu Jan 1 09:00:00 1970
+++ print/panda/files/patch-database.c Fri Apr 16 01:13:25 2004
@@ -0,0 +1,29 @@
+--- database.c.orig Tue Apr 13 09:46:24 2004
++++ database.c Fri Apr 16 01:13:10 2004
+@@ -160,6 +160,12 @@
+ panda_windbwrite (document, key, value);
+ #else
+
++#ifdef USE_EDB
++ e_db_data_set((E_DB_File *)document->db, key, value, strlen(value)+1);
++#else
++ DBT db_key, db_data;
++ int ec;
++
+ #if defined DEBUG
+ printf ("Storing (%s, %s) in 0x%08x\n", key, value, document->db);
+ #endif
+@@ -168,13 +174,6 @@
+ panda_error (panda_true, "Cannot store null key\n");
+ if (value == NULL)
+ panda_error (panda_true, "Cannot store null value\n");
+-
+-#ifdef USE_EDB
+-
+- e_db_data_set((E_DB_File *)document->db, key, value, strlen(value)+1);
+-#else
+- DBT db_key, db_data;
+- int ec;
+
+ memset(&db_key, 0, sizeof(db_key));
+ memset(&db_data, 0, sizeof(db_data));
diff -urN /usr/ports/print/panda/pkg-descr print/panda/pkg-descr
--- /usr/ports/print/panda/pkg-descr Wed Mar 28 18:33:32 2001
+++ print/panda/pkg-descr Thu Apr 15 23:36:09 2004
@@ -1,3 +1,3 @@
-Panda is a GPL'ed PDF generation library.
+Panda is a PDF generation API written in C.
-WWW: http://www.stillhq.com/cgi-bin/getpage?area=panda&page=index.htm
+WWW: http://www.stillhq.com/cgi-bin/getpage?area=panda&page=index.htm
diff -urN /usr/ports/print/panda/pkg-plist print/panda/pkg-plist
--- /usr/ports/print/panda/pkg-plist Tue Jul 1 17:17:35 2003
+++ print/panda/pkg-plist Fri Apr 16 01:20:52 2004
@@ -2,34 +2,33 @@
include/panda/functions.h
include/panda/legacy.h
include/panda/objects.h
-include/panda/panda_spinlock.h
-include/panda/panda_tdb.h
lib/libpanda.a
lib/libpanda.so
lib/libpanda.so.0
-%%PORTDOCS%%share/doc/panda/AUTHORS
-%%PORTDOCS%%share/doc/panda/CONTRIBUTORS
-%%PORTDOCS%%share/doc/panda/ChangeLog
-%%PORTDOCS%%share/doc/panda/DEV-HINTS
-%%PORTDOCS%%share/doc/panda/README
-%%PORTDOCS%%share/doc/panda/TODO
-%%PORTDOCS%%share/doc/panda/UNDERWAY
-%%PORTDOCS%%share/examples/panda/IMAGES
-%%PORTDOCS%%share/examples/panda/RedbrushAlpha.png
-%%PORTDOCS%%share/examples/panda/circles.c
-%%PORTDOCS%%share/examples/panda/empty.c
-%%PORTDOCS%%share/examples/panda/exercise.c
-%%PORTDOCS%%share/examples/panda/gnu-head.jpg
-%%PORTDOCS%%share/examples/panda/gnu.png
-%%PORTDOCS%%share/examples/panda/gnu_box.jpg
-%%PORTDOCS%%share/examples/panda/input.tif
-%%PORTDOCS%%share/examples/panda/input2.tif
-%%PORTDOCS%%share/examples/panda/legacymain.c
-%%PORTDOCS%%share/examples/panda/libpng.png
-%%PORTDOCS%%share/examples/panda/main.c
-%%PORTDOCS%%share/examples/panda/morecircles.c
-%%PORTDOCS%%share/examples/panda/pandaexample.cpp
-%%PORTDOCS%%share/examples/panda/template.c
-%%PORTDOCS%%@dirrm share/examples/panda
-%%PORTDOCS%%@dirrm share/doc/panda
+libdata/pkgconfig/panda.pc
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/DEV-HINTS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UNDERWAY
+%%PORTDOCS%%%%EXAMPLESDIR%%/IMAGES
+%%PORTDOCS%%%%EXAMPLESDIR%%/RedbrushAlpha.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/circles.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/empty.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/exercise.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/gnu-head.jpg
+%%PORTDOCS%%%%EXAMPLESDIR%%/gnu.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/gnu_box.jpg
+%%PORTDOCS%%%%EXAMPLESDIR%%/input.tif
+%%PORTDOCS%%%%EXAMPLESDIR%%/input2.tif
+%%PORTDOCS%%%%EXAMPLESDIR%%/legacymain.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/libpng.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/main.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/morecircles.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/pandaexample.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/template.c
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/panda