From 666a6ebcd6745eccd0e45d4249df9e42b1ae5d81 Mon Sep 17 00:00:00 2001 From: espie Date: Tue, 21 Nov 2006 10:07:26 +0000 Subject: [PATCH] new MULTI_PACKAGES --- print/freetype/Makefile | 15 +++---- print/freetype/pkg/{DESCR => DESCR-main} | 0 print/freetype/pkg/PFRAG.shared | 2 - print/freetype/pkg/PFRAG.shared-main | 2 + print/freetype/pkg/{PLIST => PLIST-main} | 3 +- print/poppler/Makefile | 42 +++++++++---------- print/poppler/pkg/{DESCR => DESCR-main} | 0 .../pkg/{PFRAG.shared => PFRAG.shared-main} | 2 +- print/poppler/pkg/{PLIST => PLIST-main} | 3 +- 9 files changed, 32 insertions(+), 37 deletions(-) rename print/freetype/pkg/{DESCR => DESCR-main} (100%) delete mode 100644 print/freetype/pkg/PFRAG.shared create mode 100644 print/freetype/pkg/PFRAG.shared-main rename print/freetype/pkg/{PLIST => PLIST-main} (86%) rename print/poppler/pkg/{DESCR => DESCR-main} (100%) rename print/poppler/pkg/{PFRAG.shared => PFRAG.shared-main} (57%) rename print/poppler/pkg/{PLIST => PLIST-main} (97%) diff --git a/print/freetype/Makefile b/print/freetype/Makefile index 9c518fa20db..ebce6ecbe75 100644 --- a/print/freetype/Makefile +++ b/print/freetype/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.38 2006/01/08 01:33:16 brad Exp $ +# $OpenBSD: Makefile,v 1.39 2006/11/21 10:07:26 espie Exp $ # $FreeBSD: Makefile,v 1.6 1998/06/21 02:42:33 jseger Exp $ -COMMENT= "free and portable TrueType font rendering engine" +COMMENT-main= "free and portable TrueType font rendering engine" COMMENT-doc= "documentation for FreeType" VERSION= 1.3.1 DISTNAME= freetype-${VERSION} -PKGNAME= ${DISTNAME}p2 +PKGNAME-main= ${DISTNAME}p3 PKGNAME-doc= freetype-doc-${VERSION} CATEGORIES= print @@ -31,13 +31,10 @@ CONFIGURE_STYLE= gnu dest CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --enable-static --disable-nls -MULTI_PACKAGES= -doc -SUBPACKAGE?= +MULTI_PACKAGES= -main -doc -.if defined(PACKAGING) && ${SUBPACKAGE} == "-doc" -PKG_ARCH= * -WANTLIB= -.endif +PKG_ARCH-doc= * +WANTLIB-doc= FT_DOC= ${PREFIX}/share/doc/freetype SFT_DOC= ${WRKSRC}/docs diff --git a/print/freetype/pkg/DESCR b/print/freetype/pkg/DESCR-main similarity index 100% rename from print/freetype/pkg/DESCR rename to print/freetype/pkg/DESCR-main diff --git a/print/freetype/pkg/PFRAG.shared b/print/freetype/pkg/PFRAG.shared deleted file mode 100644 index 47d5e9d20ef..00000000000 --- a/print/freetype/pkg/PFRAG.shared +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/23 20:40:21 mbalmer Exp $ -@lib lib/libttf.so.${LIBttf_VERSION} diff --git a/print/freetype/pkg/PFRAG.shared-main b/print/freetype/pkg/PFRAG.shared-main new file mode 100644 index 00000000000..d3832f3e16a --- /dev/null +++ b/print/freetype/pkg/PFRAG.shared-main @@ -0,0 +1,2 @@ +@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/21 10:07:26 espie Exp $ +@lib lib/libttf.so.${LIBttf_VERSION} diff --git a/print/freetype/pkg/PLIST b/print/freetype/pkg/PLIST-main similarity index 86% rename from print/freetype/pkg/PLIST rename to print/freetype/pkg/PLIST-main index 017d931a857..48c00e253ee 100644 --- a/print/freetype/pkg/PLIST +++ b/print/freetype/pkg/PLIST-main @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.12 2004/09/15 18:32:14 espie Exp $ +@comment $OpenBSD: PLIST-main,v 1.1 2006/11/21 10:07:26 espie Exp $ +@pkgpath print/freetype include/freetype1/ include/freetype1/freetype/ include/freetype1/freetype/freetype.h diff --git a/print/poppler/Makefile b/print/poppler/Makefile index 9a333e1411c..cd1bea970e8 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -1,12 +1,13 @@ -# $OpenBSD: Makefile,v 1.4 2006/10/30 08:28:26 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2006/11/21 10:10:01 espie Exp $ -COMMENT= "PDF rendering library" +COMMENT-main= "PDF rendering library" COMMENT-qt= "qt interface to PDF rendering library" V= 0.5.3 DISTNAME= poppler-$V CATEGORIES= print -FULLPKGNAME-qt= poppler-qt-$V +PKGNAME-main= poppler-$Vp0 +FULLPKGNAME-qt= poppler-qt-$Vp0 SHARED_LIBS += poppler 1.0 # .1.0 SHARED_LIBS += poppler-glib 1.0 # .1.0 @@ -23,9 +24,8 @@ PERMIT_DISTFILES_CDROM= Yes MASTER_SITES= ${HOMEPAGE} PSEUDO_FLAVORS=no_qt +MULTI_PACKAGES=-main FLAVOR?= -SUBPACKAGE?= - .if empty(FLAVOR:L:Mno_qt) MULTI_PACKAGES+=-qt @@ -38,14 +38,23 @@ MAKE_FLAGS= POPPLER_QT_CXXFLAGS='-pthread -I${MODQT_INCDIR}' \ qt_subdir=qt \ qt_pc_file=poppler-qt.pc -. if !defined(PACKAGING) || defined(PACKAGING) && ${SUBPACKAGE} == "-qt" MODULES+= x11/qt3 -. endif -. if defined(PACKAGING) && ${SUBPACKAGE} == "-qt" -LIB_DEPENDS+= poppler::print/poppler -. endif .endif +BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig + +WANTLIB= freetype fontconfig jpeg z + +LIB_DEPENDS-qt= ${MODQT_LIB_DEPENDS} poppler::print/poppler + +MODULES+= devel/gettext + +LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \ + gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 +WANTLIB-main= ${WANTLIB} Xrender png X11 m Xext glitz \ + gmodule-2.0 cairo \ + pango-1.0 pangocairo-1.0 pangoft2-1.0 \ + gobject-2.0 glib-2.0 CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --enable-xpdf-headers \ @@ -58,19 +67,6 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR=${WRKINST} -WANTLIB+= freetype fontconfig jpeg z - -.if !defined(PACKAGING) || defined(PACKAGING) && ${SUBPACKAGE} == "" -MODULES+= devel/gettext -LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 -WANTLIB+= Xrender png X11 m Xext glitz \ - gmodule-2.0 cairo \ - pango-1.0 pangocairo-1.0 pangoft2-1.0 \ - gobject-2.0 glib-2.0 -.endif - -BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig - USE_LIBTOOL= Yes USE_X11= Yes diff --git a/print/poppler/pkg/DESCR b/print/poppler/pkg/DESCR-main similarity index 100% rename from print/poppler/pkg/DESCR rename to print/poppler/pkg/DESCR-main diff --git a/print/poppler/pkg/PFRAG.shared b/print/poppler/pkg/PFRAG.shared-main similarity index 57% rename from print/poppler/pkg/PFRAG.shared rename to print/poppler/pkg/PFRAG.shared-main index 7884e70dc81..801873d00d3 100644 --- a/print/poppler/pkg/PFRAG.shared +++ b/print/poppler/pkg/PFRAG.shared-main @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/06/18 13:09:44 alek Exp $ +@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/21 10:10:01 espie Exp $ @lib lib/libpoppler-glib.so.${LIBpoppler-glib_VERSION} @lib lib/libpoppler.so.${LIBpoppler_VERSION} diff --git a/print/poppler/pkg/PLIST b/print/poppler/pkg/PLIST-main similarity index 97% rename from print/poppler/pkg/PLIST rename to print/poppler/pkg/PLIST-main index 8ebba287a88..754ca5f39d5 100644 --- a/print/poppler/pkg/PLIST +++ b/print/poppler/pkg/PLIST-main @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/06/18 13:09:44 alek Exp $ +@comment $OpenBSD: PLIST-main,v 1.1 2006/11/21 10:10:01 espie Exp $ +@pkgpath print/poppler %%SHARED%% include/poppler/ include/poppler/Annot.h