remove the hack that permitted building without podofo

textproc/calibre/Makefile

@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.28 2014/03/31 23:54:35 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2014/04/06 11:32:04 sthen Exp $
 
 COMMENT =		ebook management application
 
 DISTNAME =		calibre-1.30.0
+REVISION =		0
 CATEGORIES =		textproc
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX =		.tar.xz
@@ -19,16 +20,15 @@ WANTLIB += ${MODPY_WANTLIB}
 WANTLIB += ICE MagickCore MagickWand lib/qt4/QtDBus lib/qt4/QtGui
 WANTLIB += lib/qt4/QtSvg lib/qt4/QtXml SM X11 Xext Xi Xinerama Xrender
 WANTLIB += chm fontconfig freetype icudata icui18n icuio icuuc m mtp
-WANTLIB += pthread stdc++ usb-1.0 z
+WANTLIB += podofo pthread stdc++ usb-1.0 z
 
 LIB_DEPENDS=		devel/chmlib \
 			devel/libmtp \
 			devel/libusb1 \
 			graphics/ImageMagick \
-			textproc/icu4c
+			textproc/icu4c \
+			textproc/podofo
 
-# XXX PoDoFo should be ported and added here; then remove hack
-# XXX from patch-setup_extensions_py that makes it optional
 COMMON_DEPENDS =	databases/py-apsw \
 			devel/py-dateutil \
 			devel/xdg-utils \
@@ -70,8 +70,8 @@ MAKE_ENV +=		QMAKE="${LOCALBASE}/bin/qmake4"
 MAKE_ENV +=		LDFLAGS="${LDFLAGS}"
 MAKE_ENV +=		FT_LIB_DIR="${X11BASE}/lib"
 MAKE_ENV +=		XDG_DATA_DIRS="${PREFIX}/share"
-#MAKE_ENV +=		PODOFO_INC_DIR="${LOCALBASE}/include/podofo"
-#MAKE_ENV +=		PODOFO_LIB_DIR="${LOCALBASE}/lib"
+MAKE_ENV +=		PODOFO_INC_DIR="${LOCALBASE}/include/podofo"
+MAKE_ENV +=		PODOFO_LIB_DIR="${LOCALBASE}/lib"
 
 # Requires /sys filesystem for HW detection
 MAKE_ENV +=		WITH_USB=no

textproc/calibre/patches/patch-setup_extensions_py

@@ -1,6 +1,5 @@
-$OpenBSD: patch-setup_extensions_py,v 1.6 2014/03/31 23:54:35 sthen Exp $
+$OpenBSD: patch-setup_extensions_py,v 1.7 2014/04/06 11:32:04 sthen Exp $
 
-- XXX make podofo optional as it isn't ported yet; should be fixed
 - fix various header search paths
 - don't override compiler optimizer levels
 - build with libmtp/libusb1 on OpenBSD (possibly useless as it looks like it
@@ -35,15 +34,7 @@ it's correct with "env" here (handled in infrastructure).
  
      def preflight(self, obj_dir, compiler, linker, builder, cflags, ldflags):
          pass
-@@ -201,6 +194,7 @@ extensions = [
-                     libraries=['podofo'],
-                     lib_dirs=[podofo_lib],
-                     inc_dirs=[podofo_inc, os.path.dirname(podofo_inc)],
-+                    optional=1,
-                     error=podofo_error),
- 
-     Extension('pictureflow',
-@@ -281,9 +275,10 @@ if isosx:
+@@ -281,9 +274,10 @@ if isosx:
                  ldflags=['-framework', 'CoreServices', '-framework', 'IOKit'])
              )
  
@@ -55,7 +46,7 @@ it's correct with "env" here (handled in infrastructure).
          libraries=['usb-1.0']
      ))
  
-@@ -297,6 +292,7 @@ if islinux or isosx:
+@@ -297,6 +291,7 @@ if islinux or isosx:
          'calibre/devices/mtp/unix/upstream/music-players.h',
          'calibre/devices/mtp/unix/upstream/device-flags.h',
          ],
@@ -63,7 +54,7 @@ it's correct with "env" here (handled in infrastructure).
          libraries=['mtp']
      ))
  
-@@ -324,9 +320,9 @@ if isbsd:
+@@ -324,9 +319,9 @@ if isbsd:
      cflags.append('-pthread')
      ldflags.append('-shared')
      cflags.append('-I'+sysconfig.get_python_inc())
@@ -74,7 +65,7 @@ it's correct with "env" here (handled in infrastructure).
  if isosx:
      x, p = ('i386', 'x86_64')
      archs = ['-arch', x, '-arch', p, '-isysroot',
-@@ -533,7 +529,7 @@ class Build(Command):
+@@ -533,7 +528,7 @@ class Build(Command):
          DESTDIR = .
          TARGET = calibre
          QT *= svg

textproc/calibre/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2014/03/31 23:54:36 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.12 2014/04/06 11:32:04 sthen Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -2323,6 +2323,7 @@ lib/calibre/calibre/plugins/magick.so
 lib/calibre/calibre/plugins/matcher.so
 lib/calibre/calibre/plugins/msdes.so
 lib/calibre/calibre/plugins/pictureflow.so
+lib/calibre/calibre/plugins/podofo.so
 lib/calibre/calibre/plugins/progress_indicator.so
 lib/calibre/calibre/plugins/qt_hack.so
 lib/calibre/calibre/plugins/speedup.so