Index: head/graphics/gimp-devel/Makefile =================================================================== --- head/graphics/gimp-devel/Makefile (revision 191049) +++ head/graphics/gimp-devel/Makefile (revision 191050) @@ -1,51 +1,52 @@ # New ports collection makefile for: The GIMP # Date created: Mon Nov 18 21:28:43 CST 1996 # Whom: erich@FreeBSD.org # # $FreeBSD$ # $MCom: ports/graphics/gimp-devel/Makefile,v 1.30 2007/04/03 17:42:21 ahze Exp $ # PORTNAME= gimp PORTVERSION?= 2.3 +PORTREVISION= 1 PORTEPOCH?= 2 CATEGORIES= graphics gnome MASTER_SITES?= # empty PKGNAMESUFFIX= -devel DISTFILES?= # empty EXTRACT_ONLY?= # empty MAINTAINER= gnome@FreeBSD.org COMMENT= The "meta-port" for The Gimp RUN_DEPENDS= gimp-2.3:${PORTSDIR}/graphics/gimp-app-devel OPTIONS= PYTHON "Python-fu support" Off \ PRINT "Gutenprint (gimp-print) plugin" On # HELP "Install Gimp-Help (50+MB distfile)" Off NO_BUILD= yes .include pre-everything:: @if [ -n "`${PKG_INFO} -xI '^gimp[-gnome]*-[0-9].[0-9].[0-9]*' 2>/dev/null`" ]; then \ ${ECHO_CMD} "${PKGNAME}: Old version of gimp detected! Please see ${PORTSDIR}/UPDATING for information on upgrading ${PKGNAME}" ; \ ${FALSE}; \ fi #.if defined(WITH_HELP) #RUN_DEPENDS+= gimp-help>0:${PORTSDIR}/graphics/gimp-help #.endif .if defined(WITH_PYTHON) RUN_DEPENDS+= ${LOCALBASE}/libexec/gimp/2.2/environ/pygimp.env:${PORTSDIR}/graphics/py-gimp .endif .if !defined(WITHOUT_PRINT) -RUN_DEPENDS+= ${LOCALBASE}/libexec/gimp/2.2/plug-ins/print:${PORTSDIR}/print/gimp-gutenprint +RUN_DEPENDS+= ${LOCALBASE}/libexec/gimp/2.2/plug-ins/print:${PORTSDIR}/print/gimp-devel-gutenprint .endif do-install: # empty .include Property changes on: head/graphics/gimp-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.164 \ No newline at end of property +1.165 \ No newline at end of property Index: head/print/Makefile =================================================================== --- head/print/Makefile (revision 191049) +++ head/print/Makefile (revision 191050) @@ -1,313 +1,314 @@ # $FreeBSD$ # COMMENT = Desktop publishing SUBDIR += a2ps-a4 SUBDIR += a2ps-letter SUBDIR += a2ps-letterdj SUBDIR += abc2mtex SUBDIR += abcm2ps SUBDIR += abntex SUBDIR += acrobatviewer SUBDIR += acroread7 SUBDIR += acroreadwrapper SUBDIR += adobe-cmaps SUBDIR += advi SUBDIR += afm SUBDIR += alignmargins SUBDIR += amspsfnt SUBDIR += ansiprint SUBDIR += apsfilter SUBDIR += asprint SUBDIR += auctex SUBDIR += axpoint SUBDIR += bibcursed SUBDIR += bibview SUBDIR += bjfilter360 SUBDIR += bjfilter850 SUBDIR += bjfilter850ug SUBDIR += bjfilter860 SUBDIR += bjfilter870 SUBDIR += bjfiltercom SUBDIR += bjfilters600 SUBDIR += bjfilters630 SUBDIR += bjfilters6300 SUBDIR += c2ps-a4 SUBDIR += c2ps-letter SUBDIR += catdvi SUBDIR += cdlabelgen SUBDIR += cjk-lyx SUBDIR += clibpdf SUBDIR += cm-super SUBDIR += cmpsfont SUBDIR += cpp2latex SUBDIR += cups SUBDIR += cups-base SUBDIR += cups-magicolor SUBDIR += cups-pdf SUBDIR += cups-pstoraster SUBDIR += cups-samba SUBDIR += cups-smb-backend SUBDIR += detex SUBDIR += dk-acroread SUBDIR += dvi2tty SUBDIR += dvi2xx SUBDIR += dvipdfmx SUBDIR += dvips SUBDIR += dvips2ascii SUBDIR += dvipsk-tetex SUBDIR += dviselect SUBDIR += dvisvg SUBDIR += easylatex SUBDIR += enscript-a4 SUBDIR += enscript-letter SUBDIR += enscript-letterdj SUBDIR += enscriptfonts SUBDIR += envelope SUBDIR += epsmerge SUBDIR += epsonepl SUBDIR += es-acroread SUBDIR += fi-acroread SUBDIR += flpsed SUBDIR += font2svg SUBDIR += fontforge SUBDIR += foo2zjs SUBDIR += foomatic-db SUBDIR += foomatic-db-engine SUBDIR += foomatic-db-hpijs SUBDIR += foomatic-filters SUBDIR += fpdf SUBDIR += freetype SUBDIR += freetype-tools SUBDIR += freetype2 SUBDIR += ft2demos SUBDIR += gfontview SUBDIR += ggv SUBDIR += ghostscript-afpl SUBDIR += ghostscript-afpl-nox11 SUBDIR += ghostscript-gnu SUBDIR += ghostscript-gnu-commfont SUBDIR += ghostscript-gnu-nox11 SUBDIR += ghostscript-gpl SUBDIR += ghostscript-gpl-nox11 SUBDIR += ghostview + SUBDIR += gimp-devel-gutenprint SUBDIR += gimp-gutenprint SUBDIR += gimp-print SUBDIR += gl2ps SUBDIR += gnome-cups-manager SUBDIR += gnome-print SUBDIR += gnomephotoprinter SUBDIR += gribouy SUBDIR += gsfonts SUBDIR += gspdf SUBDIR += gtklp SUBDIR += guitartex SUBDIR += gutenprint SUBDIR += gutenprint-base SUBDIR += gutenprint-cups SUBDIR += gutenprint-foomatic SUBDIR += gutenprint-ijs SUBDIR += gv SUBDIR += hp2xx SUBDIR += hpijs SUBDIR += hplip SUBDIR += html2latex SUBDIR += html2ps-a4 SUBDIR += html2ps-letter SUBDIR += hugelatex SUBDIR += hyperlatex SUBDIR += ifhp SUBDIR += it-acroread SUBDIR += jabref SUBDIR += jadetex SUBDIR += kaspaliste SUBDIR += kcdlabel SUBDIR += kover SUBDIR += kpdftool SUBDIR += latex SUBDIR += latex-arydshln SUBDIR += latex-auto-greek SUBDIR += latex-beamer SUBDIR += latex-biblist SUBDIR += latex-bytefield SUBDIR += latex-caption SUBDIR += latex-circ SUBDIR += latex-feynmf SUBDIR += latex-keystroke SUBDIR += latex-logpap SUBDIR += latex-mathabx SUBDIR += latex-msc SUBDIR += latex-pgf SUBDIR += latex-subfloat SUBDIR += latex-svninfo SUBDIR += latex-timing SUBDIR += latex-tipa SUBDIR += latex-ucs SUBDIR += latex2rtf SUBDIR += latex2slides SUBDIR += latexdiff SUBDIR += latexmk SUBDIR += lgrind SUBDIR += libgnomecups SUBDIR += libgnomeprint SUBDIR += libgnomeprint-reference SUBDIR += libgnomeprintmm SUBDIR += libijs SUBDIR += libotf SUBDIR += libpaper SUBDIR += libppd SUBDIR += lilypond SUBDIR += lout SUBDIR += lpr-wrapper SUBDIR += lprps-a4 SUBDIR += lprps-letter SUBDIR += lyx SUBDIR += magicfilter SUBDIR += makeindex SUBDIR += mapagi SUBDIR += mftrace SUBDIR += mgv SUBDIR += mp-a4 SUBDIR += mp-letter SUBDIR += mpage SUBDIR += mup SUBDIR += musixtex SUBDIR += muttprint SUBDIR += nenscript SUBDIR += nl-acroread SUBDIR += no-acroread SUBDIR += p5-Net-Printer SUBDIR += p5-PDF-Template SUBDIR += p5-PDFLib SUBDIR += p5-PostScript-Simple SUBDIR += p5-Text-PDF SUBDIR += p5-XML-ApacheFOP SUBDIR += panda SUBDIR += passivetex SUBDIR += pcal SUBDIR += pclprint SUBDIR += pdfcube SUBDIR += pdfjam SUBDIR += pdflib SUBDIR += pdflib-perl SUBDIR += pdfmerge SUBDIR += pdftk SUBDIR += pdq SUBDIR += pear-File_PDF SUBDIR += pecl-pdflib SUBDIR += perlftlib SUBDIR += pfbtopfa SUBDIR += phppdflib SUBDIR += pic2fig SUBDIR += pips-sc60s SUBDIR += pips-sc65_66s SUBDIR += pips-sc80s SUBDIR += pips-sc84_83s SUBDIR += pips-sc85_86s SUBDIR += pips-scx3500_3600s SUBDIR += pips-sp2100_2200 SUBDIR += pips-spr200_210 SUBDIR += pips-spr300_310 SUBDIR += pips-spr800 SUBDIR += pips2200 SUBDIR += pips3000 SUBDIR += pips3300 SUBDIR += pips3500 SUBDIR += pips4000 SUBDIR += pips670 SUBDIR += pips730 SUBDIR += pips740 SUBDIR += pips740-cups SUBDIR += pips750_2000 SUBDIR += pips760 SUBDIR += pips770 SUBDIR += pips780 SUBDIR += pips800 SUBDIR += pips820 SUBDIR += pips870 SUBDIR += pips870-cups SUBDIR += pips880 SUBDIR += pips900 SUBDIR += pips930 SUBDIR += pips940 SUBDIR += pips970 SUBDIR += pips970-cups SUBDIR += pips980 SUBDIR += pipsg700 SUBDIR += pipsg800 SUBDIR += pipsg900 SUBDIR += pipsv500 SUBDIR += pipsv600 SUBDIR += pipsv700 SUBDIR += pipsv700-cups SUBDIR += pkfonts118 SUBDIR += pkfonts240 SUBDIR += pkfonts300 SUBDIR += pkfonts360 SUBDIR += pkfonts400 SUBDIR += pkfonts600 SUBDIR += pkpgcounter SUBDIR += pmw SUBDIR += pnm2ppa SUBDIR += poster SUBDIR += ps2eps SUBDIR += pscal SUBDIR += psdim SUBDIR += pslib SUBDIR += psmark SUBDIR += pstotext SUBDIR += psutils-a4 SUBDIR += psutils-letter SUBDIR += pup SUBDIR += py-fonttools SUBDIR += py-pyscript SUBDIR += py-reportlab SUBDIR += py-reportlab2 SUBDIR += py-rtf SUBDIR += rlpr SUBDIR += rprint SUBDIR += rtf2latex SUBDIR += ruby-clibpdf SUBDIR += ruby-gnomeprint SUBDIR += ruby-panda SUBDIR += ruby-pdflib SUBDIR += rubygem-colortools SUBDIR += rubygem-pdfwriter SUBDIR += scribus SUBDIR += sgf2tex SUBDIR += sv-acroread SUBDIR += t1utils SUBDIR += teTeX SUBDIR += teTeX-base SUBDIR += teTeX-texmf SUBDIR += tex SUBDIR += tex-omegaware-old SUBDIR += tex-texmflocal SUBDIR += texinfo SUBDIR += texpower SUBDIR += tgif2tex SUBDIR += tipograf SUBDIR += tr2latex SUBDIR += transfig SUBDIR += trueprint SUBDIR += ttf2pt1 SUBDIR += ttfquery SUBDIR += ttftot42 SUBDIR += txtbdf2ps SUBDIR += typetools SUBDIR += virtualpaper SUBDIR += wmlpq SUBDIR += wprint SUBDIR += xdvi SUBDIR += xdvik SUBDIR += xfce4-print SUBDIR += xmbibtex SUBDIR += xmltex SUBDIR += xpp SUBDIR += xtexsh SUBDIR += yatex SUBDIR += yatex-mule SUBDIR += yatex-xemacs .include Property changes on: head/print/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.424 \ No newline at end of property +1.425 \ No newline at end of property Index: head/print/gimp-devel-gutenprint/Makefile =================================================================== --- head/print/gimp-devel-gutenprint/Makefile (revision 191049) +++ head/print/gimp-devel-gutenprint/Makefile (revision 191050) @@ -1,21 +1,21 @@ # New ports collection makefile for: gutenprint-gimp # Date created: 2006-12-31 # Whom: Michael Johnson # # $FreeBSD$ # $MCom: ports/print/gimp-gutenprint/Makefile,v 1.2 2007/03/30 16:42:46 ahze Exp $ PORTREVISION= 0 PORTEPOCH= 0 -PKGNAMEPREFIX= gimp- +PKGNAMEPREFIX= gimp-devel- PKGNAMESUFFIX= # empty MAINTAINER= ahze@FreeBSD.org COMMENT= Gimp print plug-in MASTERDIR= ${.CURDIR}/../../print/gutenprint-base -GUT_SLAVE= gimp +GUT_SLAVE= gimp-devel PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" Property changes on: head/print/gimp-devel-gutenprint/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/print/gutenprint-base/Makefile =================================================================== --- head/print/gutenprint-base/Makefile (revision 191049) +++ head/print/gutenprint-base/Makefile (revision 191050) @@ -1,115 +1,119 @@ -# ports collection makefile for: [Jgimp-print +# ports collection makefile for: gimp-print # Date Created: 2002 01 02 # Whom: dgilbert@velocet.ca # # $FreeBSD$ # $MCom: ports/print/gutenprint-base/Makefile,v 1.8 2007/03/30 16:45:02 ahze Exp $ # PORTNAME?= gutenprint PORTVERSION= 5.1.0 PORTREVISION?= 1 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gimp-print PKGNAMESUFFIX?= -base MAINTAINER= ahze@FreeBSD.org COMMENT= GutenPrint Printer Driver CONFLICTS= gimp-print-[0-9]* USE_BZIP2= yes USE_GETTEXT= yes USE_GETOPT_LONG= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget gtk20 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS=--with-gimp=no --with-gimp2=no \ --with-mandir=${PREFIX}/man USE_LDCONFIG= yes CPPFLAGS= -I${LOCALBASE}/include -I${PREFIX}/include LDFLAGS= -L${LOCALBASE}/lib -L${PREFIX}/lib .include .if ${SLAVE_PORT}=="yes" LIB_DEPENDS+= gutenprintui2.1:${PORTSDIR}/print/gutenprint-base PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprintui2` .else MAN1+= escputil.1 .endif -.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp" -LIB_DEPENDS+= gimp-2.0:${PORTSDIR}/graphics/gimp-app \ - gutenprint.2:${PORTSDIR}/print/gutenprint-base +.if defined(GUT_SLAVE) && (${GUT_SLAVE}=="gimp" || ${GUT_SLAVE}=="gimp-devel") +.if ${GUT_SLAVE}=="gimp" +LIB_DEPENDS+= gimp-2.0:${PORTSDIR}/graphics/gimp-app +.elif ${GUT_SLAVE}=="gimp-devel" +LIB_DEPENDS+= gimp-2.0:${PORTSDIR}/graphics/gimp-app-devel +.endif +LIB_DEPENDS+= gutenprint.2:${PORTSDIR}/print/gutenprint-base CONFIGURE_ARGS=--with-gimp2=yes # Override CONFIGURE_ARGS BUILD_WRKSRC= ${WRKSRC}/src/gimp2 INSTALL_WRKSRC= ${WRKSRC}/src/gimp2 .else CONFIGURE_ARGS+=--without-gimp2 .endif .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="cups" LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base RUN_DEPENDS+= espgs:${PORTSDIR}/print/cups-pstoraster CONFIGURE_ARGS+= --with-cups=${PREFIX} \ --enable-cups-ppds \ --enable-cups-level3-ppds MAN8+= cups-calibrate.8 cups-genppd.8 cups-genppdconfig.8 \ cups-genppdupdate.8 BUILD_WRKSRC= ${WRKSRC}/src/cups INSTALL_WRKSRC= ${WRKSRC}/src/cups .else CONFIGURE_ARGS+= --without-cups .endif .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="ijs" LIB_DEPENDS+= ijs.1:${PORTSDIR}/print/libijs CONFIGURE_ARGS+=--with-ijs=yes MAN1+= ijsgutenprint.1 BUILD_WRKSRC= ${WRKSRC}/src/ghost INSTALL_WRKSRC= ${WRKSRC}/src/ghost .else CONFIGURE_ARGS+=--without-ghostscript .endif .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="foomatic" BUILD_DEPENDS+= foomatic-combo-xml:${PORTSDIR}/print/foomatic-db-engine RUN_DEPENDS+= foomatic-combo-xml:${PORTSDIR}/print/foomatic-db-engine \ foomatic-db>0:${PORTSDIR}/print/foomatic-db CONFIGURE_ARGS+=--with-foomatic=yes --with-foomatic3=yes BUILD_WRKSRC= ${WRKSRC}/src/foomatic INSTALL_WRKSRC= ${WRKSRC}/src/foomatic .else CONFIGURE_ARGS+=--without-foomatic .endif .if defined(NOPORTDOCS) CONFIGURE_ARGS+= --with-user-guide=no .endif post-patch: .if ${SLAVE_PORT}=="no" || ${GUT_SLAVE}!="cups" @${REINPLACE_CMD} -e 's|cups ||' ${WRKSRC}/src/Makefile.in .endif .if ${SLAVE_PORT}=="yes" @${REINPLACE_CMD} -e 's|= escputil.1|= |' ${WRKSRC}/man/Makefile.in .endif @${REINPLACE_CMD} -e 's|%%GUTENPRINTUI2_LIBS%%|${GUTENPRINTUI2_LIBS}|' \ ${WRKSRC}/src/gimp2/Makefile.in @${REINPLACE_CMD} -e 's|$$libdir/gimp/1.2/plug-ins||g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|@mandir@|${PREFIX}/man|' ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e 's|= $$(pkglibdir)|= ${PREFIX}/libexec/cups|' \ ${WRKSRC}/src/cups/Makefile.in post-install: .if ${SLAVE_PORT}=="yes" @(cd ${WRKSRC}/man && ${GMAKE} ${INSTALL_TARGET}) .endif .include Property changes on: head/print/gutenprint-base/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.34 \ No newline at end of property +1.35 \ No newline at end of property