diff options
| -rw-r--r-- | misc/koffice/Makefile | 4 | ||||
| -rw-r--r-- | misc/tellico-kde3/options.mk | 4 | ||||
| -rw-r--r-- | print/Makefile | 4 | ||||
| -rw-r--r-- | print/poppler-qt/buildlink3.mk | 15 | ||||
| -rw-r--r-- | print/poppler016-qt3/DESCR (renamed from print/poppler-qt/DESCR) | 0 | ||||
| -rw-r--r-- | print/poppler016-qt3/Makefile (renamed from print/poppler-qt/Makefile) | 2 | ||||
| -rw-r--r-- | print/poppler016-qt3/PLIST (renamed from print/poppler-qt/PLIST) | 2 | ||||
| -rw-r--r-- | print/poppler016-qt3/buildlink3.mk | 15 | ||||
| -rw-r--r-- | print/poppler016/DESCR | 4 | ||||
| -rw-r--r-- | print/poppler016/Makefile.common | 4 |
10 files changed, 26 insertions, 28 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index d2fcd2009b3..93fb2568e42 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.171 2015/08/15 22:46:39 wiz Exp $ +# $NetBSD: Makefile,v 1.172 2015/09/12 16:50:00 joerg Exp $ DISTNAME= koffice-1.6.3 PKGREVISION= 64 @@ -67,7 +67,7 @@ post-install: .include "../../graphics/libart/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.include "../../print/poppler-qt/buildlink3.mk" +.include "../../print/poppler016-qt3/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/aspell/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/misc/tellico-kde3/options.mk b/misc/tellico-kde3/options.mk index 5cc666ba34d..b7a6c2268b2 100644 --- a/misc/tellico-kde3/options.mk +++ b/misc/tellico-kde3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1.1.1 2010/02/15 14:52:46 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2015/09/12 16:50:00 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tellico PKG_SUPPORTED_OPTIONS= poppler @@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= poppler .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mpoppler) -.include "../../print/poppler-qt/buildlink3.mk" +.include "../../print/poppler016-qt3/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-poppler .endif diff --git a/print/Makefile b/print/Makefile index a707cb92011..5333e212c09 100644 --- a/print/Makefile +++ b/print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.649 2015/09/02 11:18:43 markd Exp $ +# $NetBSD: Makefile,v 1.650 2015/09/12 16:50:00 joerg Exp $ # COMMENT= Desktop publishing @@ -119,11 +119,11 @@ SUBDIR+= poppler-cpp SUBDIR+= poppler-data SUBDIR+= poppler-glib SUBDIR+= poppler-includes -SUBDIR+= poppler-qt SUBDIR+= poppler-qt4 SUBDIR+= poppler-qt5 SUBDIR+= poppler-utils SUBDIR+= poppler016 +SUBDIR+= poppler016-qt3 SUBDIR+= poster SUBDIR+= pscal SUBDIR+= psify diff --git a/print/poppler-qt/buildlink3.mk b/print/poppler-qt/buildlink3.mk deleted file mode 100644 index acff5d3a682..00000000000 --- a/print/poppler-qt/buildlink3.mk +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.21 2014/04/29 07:57:14 wiz Exp $ - -BUILDLINK_TREE+= poppler-qt - -.if !defined(POPPLER_QT_BUILDLINK3_MK) -POPPLER_QT_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.poppler-qt+= poppler-qt>=0.4.5nb1 -BUILDLINK_ABI_DEPENDS.poppler-qt+= poppler-qt>=0.16.7nb9 -BUILDLINK_PKGSRCDIR.poppler-qt?= ../../print/poppler-qt - -.include "../../print/poppler016/buildlink3.mk" -.endif # POPPLER_QT_BUILDLINK3_MK - -BUILDLINK_TREE+= -poppler-qt diff --git a/print/poppler-qt/DESCR b/print/poppler016-qt3/DESCR index 6b70729182d..6b70729182d 100644 --- a/print/poppler-qt/DESCR +++ b/print/poppler016-qt3/DESCR diff --git a/print/poppler-qt/Makefile b/print/poppler016-qt3/Makefile index b5fca951fc4..f7ac9503502 100644 --- a/print/poppler-qt/Makefile +++ b/print/poppler016-qt3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2015/04/25 14:24:47 tnn Exp $ +# $NetBSD: Makefile,v 1.1 2015/09/12 16:50:01 joerg Exp $ # .include "../../print/poppler016/Makefile.common" diff --git a/print/poppler-qt/PLIST b/print/poppler016-qt3/PLIST index 673b4d733cf..43362b6f83f 100644 --- a/print/poppler-qt/PLIST +++ b/print/poppler016-qt3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2009/09/11 10:09:13 drochner Exp $ +@comment $NetBSD: PLIST,v 1.1 2015/09/12 16:50:01 joerg Exp $ include/poppler/qt3/poppler-link-qt3.h include/poppler/qt3/poppler-page-transition.h include/poppler/qt3/poppler-qt.h diff --git a/print/poppler016-qt3/buildlink3.mk b/print/poppler016-qt3/buildlink3.mk new file mode 100644 index 00000000000..9c138e11fa3 --- /dev/null +++ b/print/poppler016-qt3/buildlink3.mk @@ -0,0 +1,15 @@ +# $NetBSD: buildlink3.mk,v 1.1 2015/09/12 16:50:01 joerg Exp $ + +BUILDLINK_TREE+= poppler016-qt3 + +.if !defined(POPPLER_QT_BUILDLINK3_MK) +POPPLER_QT_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.poppler016-qt3+= poppler-qt>=0.4.5nb1 +BUILDLINK_ABI_DEPENDS.poppler016-qt3+= poppler-qt>=0.16.7nb9 +BUILDLINK_PKGSRCDIR.poppler016-qt3?= ../../print/poppler016-qt3 + +.include "../../print/poppler016/buildlink3.mk" +.endif # POPPLER_QT_BUILDLINK3_MK + +BUILDLINK_TREE+= -poppler016-qt3 diff --git a/print/poppler016/DESCR b/print/poppler016/DESCR index 9b551916245..e3c3c2c7a65 100644 --- a/print/poppler016/DESCR +++ b/print/poppler016/DESCR @@ -7,6 +7,4 @@ effort. And the poppler developers would like to move libpoppler forward in a number of areas that doesn't fit within the goals of xpdf. -The GLib wrapper is available in the print/poppler-glib package. -The QT wrapper is available in the print/poppler-qt package. -The PDF utilities are available in the print/poppler-utils package. +The QT wrapper is available in the print/poppler016-qt3 package. diff --git a/print/poppler016/Makefile.common b/print/poppler016/Makefile.common index fcf5ad822a4..e37a3e317d4 100644 --- a/print/poppler016/Makefile.common +++ b/print/poppler016/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.3 2014/10/05 16:41:08 wiz Exp $ +# $NetBSD: Makefile.common,v 1.4 2015/09/12 16:50:01 joerg Exp $ # # used by print/poppler016/Makefile -# used by print/poppler-qt/Makefile +# used by print/poppler016-qt3/Makefile POPPLER_VERS= 0.16.7 DISTNAME= poppler-${POPPLER_VERS} |