Changeset 34929


Ignore:
Timestamp:
2012-12-29T18:59:58+01:00 (5 years ago)
Author:
juhosg
Message:

cups: Update to 1.5.4

Update CUPS to 1.5.4 and package client, libs, filters, locales and daemon to
separate packages. Replace makefile-targets patch with components patch.
Fix ppdc patch.

Signed-off-by: Bernd Krumböck <krumboeck@…>
Patchwork: http://patchwork.openwrt.org/patch/3072/
Signed-off-by: Gabor Juhos <juhosg@…>

Location:
packages/net/cups
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/cups/Makefile

    r32519 r34929  
    99 
    1010PKG_NAME:=cups 
    11 PKG_VERSION:=1.4.4 
    12 PKG_RELEASE:=3 
     11PKG_VERSION:=1.5.4 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2 
     
    1717        ftp://ftp.easysw.com/pub/cups/$(PKG_VERSION) \ 
    1818        ftp://ftp3.easysw.com/pub/cups/$(PKG_VERSION) 
    19 PKG_MD5SUM:=8776403ad60fea9e85eab9c04d88560d 
     19PKG_MD5SUM:=de3006e5cf1ee78a9c6145ce62c4e982 
    2020 
    2121TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib 
     
    2323include $(INCLUDE_DIR)/package.mk 
    2424 
     25define Package/cups/Default 
     26  URL:=http://www.cups.org/ 
     27  SUBMENU:=Printing 
     28endef 
     29 
    2530define Package/cups 
    26   SECTION:=net 
    27   CATEGORY:=Network 
    28   DEPENDS:=+zlib +libpthread +libpng +libjpeg +libstdcpp +libusb 
    29   TITLE:=Common UNIX Printing System 
    30   URL:=http://www.cups.org/ 
     31$(call Package/cups/Default) 
     32  SECTION:=net 
     33  CATEGORY:=Network 
     34  DEPENDS:=+libcups +libcupsmime +libcupscgi +libcupsppdc +libusb 
     35  TITLE:=Common UNIX Printing System (daemon) 
    3136endef 
    3237 
    3338define Package/cups/description 
    34         A printer spooling system for devices with USB or LP support. 
     39        Common UNIX Printing System (daemon) 
    3540endef 
    3641 
    3742define Package/cups/conffiles 
    3843/etc/cups/classes.conf 
    39 /etc/cups/client.conf 
    4044/etc/cups/cupsd.conf 
    4145/etc/cups/printers.conf 
     46endef 
     47 
     48define Package/cups-bsd 
     49$(call Package/cups/Default) 
     50  SECTION:=net 
     51  CATEGORY:=Network 
     52  DEPENDS:=+libcups 
     53  TITLE:=Common UNIX Printing System - BSD commands (old) 
     54endef 
     55 
     56define Package/cups-bsd/description 
     57        Common UNIX Printing System - BSD commands (old) 
     58endef 
     59 
     60define Package/cups-client 
     61$(call Package/cups/Default) 
     62  SECTION:=net 
     63  CATEGORY:=Network 
     64  DEPENDS:=+libcups +libcupsimage +libcupsmime 
     65  TITLE:=Common UNIX Printing System - Client commands 
     66endef 
     67 
     68define Package/cups-client/conffiles 
     69/etc/cups/client.conf 
     70endef 
     71 
     72define Package/cups-client/description 
     73        Common UNIX Printing System - Client commands 
     74endef 
     75 
     76define Package/cups-filters 
     77$(call Package/cups/Default) 
     78  SECTION:=net 
     79  CATEGORY:=Network 
     80  DEPENDS:=+libcupsimage +libcupsdriver 
     81  TITLE:=Common UNIX Printing System - Filter 
     82endef 
     83 
     84define Package/cups-filters/description 
     85        Common UNIX Printing System - Filter 
     86endef 
     87 
     88define Package/cups-ppdc 
     89$(call Package/cups/Default) 
     90  SECTION:=net 
     91  CATEGORY:=Network 
     92  DEPENDS:=+libcupsppdc 
     93  TITLE:=Common UNIX Printing System - PPDC utils 
     94endef 
     95 
     96define Package/cups-ppdc/description 
     97        Common UNIX Printing System - PPDC utils 
     98endef 
     99 
     100define Package/libcups 
     101$(call Package/cups/Default) 
     102  SECTION:=libs 
     103  CATEGORY:=Libraries 
     104  DEPENDS:=+zlib +libpthread +libpng +libjpeg 
     105  TITLE:=Common UNIX Printing System - Core library 
     106endef 
     107 
     108define Package/libcups/description 
     109        Common UNIX Printing System - Core library 
     110endef 
     111 
     112define Package/libcupscgi 
     113$(call Package/cups/Default) 
     114  SECTION:=libs 
     115  CATEGORY:=Libraries 
     116  DEPENDS:=+libcups 
     117  TITLE:=Common UNIX Printing System - CGI library 
     118endef 
     119 
     120define Package/libcupscgi/description 
     121        Common UNIX Printing System - CGI library 
     122endef 
     123 
     124define Package/libcupsdriver 
     125$(call Package/cups/Default) 
     126  SECTION:=libs 
     127  CATEGORY:=Libraries 
     128  DEPENDS:=+libcups 
     129  TITLE:=Common UNIX Printing System - Driver library 
     130endef 
     131 
     132define Package/libcupsdriver/description 
     133        Common UNIX Printing System - Driver library 
     134endef 
     135 
     136define Package/libcupsimage 
     137$(call Package/cups/Default) 
     138  SECTION:=libs 
     139  CATEGORY:=Libraries 
     140  DEPENDS:=+libcups +libpng +libjpeg 
     141  TITLE:=Common UNIX Printing System - Image library 
     142endef 
     143 
     144define Package/libcupsimage/description 
     145        Common UNIX Printing System - Image library 
     146endef 
     147 
     148define Package/libcupsmime 
     149$(call Package/cups/Default) 
     150  SECTION:=libs 
     151  CATEGORY:=Libraries 
     152  DEPENDS:=+libcups 
     153  TITLE:=Common UNIX Printing System - MIME library 
     154endef 
     155 
     156define Package/libcupsmime/description 
     157        Common UNIX Printing System - MIME library 
     158endef 
     159 
     160define Package/libcupsppdc 
     161$(call Package/cups/Default) 
     162  SECTION:=libs 
     163  CATEGORY:=Libraries 
     164  DEPENDS:=+libcups +libstdcpp 
     165  TITLE:=Common UNIX Printing System - PPDC library 
     166endef 
     167 
     168define Package/libcupsppdc/description 
     169        Common UNIX Printing System - PPDC library 
     170endef 
     171 
     172define Package/cups-locale-de 
     173$(call Package/cups/Default) 
     174  SECTION:=net 
     175  CATEGORY:=Network 
     176  TITLE:=Common UNIX Printing System - Locale de 
     177endef 
     178 
     179define Package/cups-locale-de/description 
     180        Common UNIX Printing System - Locale de 
     181endef 
     182 
     183define Package/cups-locale-nl 
     184$(call Package/cups/Default) 
     185  SECTION:=net 
     186  CATEGORY:=Network 
     187  TITLE:=Common UNIX Printing System - Locale nl 
     188endef 
     189 
     190define Package/cups-locale-nl/description 
     191        Common UNIX Printing System - Locale nl 
     192endef 
     193 
     194define Package/cups-locale-hu 
     195$(call Package/cups/Default) 
     196  SECTION:=net 
     197  CATEGORY:=Network 
     198  TITLE:=Common UNIX Printing System - Locale hu 
     199endef 
     200 
     201define Package/cups-locale-hu/description 
     202        Common UNIX Printing System - Locale hu 
     203endef 
     204 
     205define Package/cups-locale-pt 
     206$(call Package/cups/Default) 
     207  SECTION:=net 
     208  CATEGORY:=Network 
     209  TITLE:=Common UNIX Printing System - Locale pt 
     210endef 
     211 
     212define Package/cups-locale-pt/description 
     213        Common UNIX Printing System - Locale pt 
     214endef 
     215 
     216define Package/cups-locale-pt_BR 
     217$(call Package/cups/Default) 
     218  SECTION:=net 
     219  CATEGORY:=Network 
     220  TITLE:=Common UNIX Printing System - Locale pt_BR 
     221endef 
     222 
     223define Package/cups-locale-pt_BR/description 
     224        Common UNIX Printing System - Locale pt_BR 
     225endef 
     226 
     227define Package/cups-locale-fi 
     228$(call Package/cups/Default) 
     229  SECTION:=net 
     230  CATEGORY:=Network 
     231  TITLE:=Common UNIX Printing System - Locale fi 
     232endef 
     233 
     234define Package/cups-locale-fi/description 
     235        Common UNIX Printing System - Locale fi 
     236endef 
     237 
     238define Package/cups-locale-sv 
     239$(call Package/cups/Default) 
     240  SECTION:=net 
     241  CATEGORY:=Network 
     242  TITLE:=Common UNIX Printing System - Locale sv 
     243endef 
     244 
     245define Package/cups-locale-sv/description 
     246        Common UNIX Printing System - Locale sv 
     247endef 
     248 
     249define Package/cups-locale-da 
     250$(call Package/cups/Default) 
     251  SECTION:=net 
     252  CATEGORY:=Network 
     253  TITLE:=Common UNIX Printing System - Locale da 
     254endef 
     255 
     256define Package/cups-locale-da/description 
     257        Common UNIX Printing System - Locale da 
     258endef 
     259 
     260define Package/cups-locale-ko 
     261$(call Package/cups/Default) 
     262  SECTION:=net 
     263  CATEGORY:=Network 
     264  TITLE:=Common UNIX Printing System - Locale ko 
     265endef 
     266 
     267define Package/cups-locale-ko/description 
     268        Common UNIX Printing System - Locale ko 
     269endef 
     270 
     271define Package/cups-locale-zh 
     272$(call Package/cups/Default) 
     273  SECTION:=net 
     274  CATEGORY:=Network 
     275  TITLE:=Common UNIX Printing System - Locale zh 
     276endef 
     277 
     278define Package/cups-locale-zh/description 
     279        Common UNIX Printing System - Locale zh 
     280endef 
     281 
     282define Package/cups-locale-ja 
     283$(call Package/cups/Default) 
     284  SECTION:=net 
     285  CATEGORY:=Network 
     286  TITLE:=Common UNIX Printing System - Locale ja 
     287endef 
     288 
     289define Package/cups-locale-ja/description 
     290        Common UNIX Printing System - Locale ja 
     291endef 
     292 
     293define Package/cups-locale-es 
     294$(call Package/cups/Default) 
     295  SECTION:=net 
     296  CATEGORY:=Network 
     297  TITLE:=Common UNIX Printing System - Locale es 
     298endef 
     299 
     300define Package/cups-locale-es/description 
     301        Common UNIX Printing System - Locale es 
     302endef 
     303 
     304define Package/cups-locale-zh_TW 
     305$(call Package/cups/Default) 
     306  SECTION:=net 
     307  CATEGORY:=Network 
     308  TITLE:=Common UNIX Printing System - Locale zh_TW 
     309endef 
     310 
     311define Package/cups-locale-zh_TW/description 
     312        Common UNIX Printing System - Locale zh_TW 
     313endef 
     314 
     315define Package/cups-locale-pl 
     316$(call Package/cups/Default) 
     317  SECTION:=net 
     318  CATEGORY:=Network 
     319  TITLE:=Common UNIX Printing System - Locale pl 
     320endef 
     321 
     322define Package/cups-locale-pl/description 
     323        Common UNIX Printing System - Locale pl 
     324endef 
     325 
     326define Package/cups-locale-no 
     327$(call Package/cups/Default) 
     328  SECTION:=net 
     329  CATEGORY:=Network 
     330  TITLE:=Common UNIX Printing System - Locale no 
     331endef 
     332 
     333define Package/cups-locale-no/description 
     334        Common UNIX Printing System - Locale no 
     335endef 
     336 
     337define Package/cups-locale-ru 
     338$(call Package/cups/Default) 
     339  SECTION:=net 
     340  CATEGORY:=Network 
     341  TITLE:=Common UNIX Printing System - Locale ru 
     342endef 
     343 
     344define Package/cups-locale-ru/description 
     345        Common UNIX Printing System - Locale ru 
     346endef 
     347 
     348define Package/cups-locale-eu 
     349$(call Package/cups/Default) 
     350  SECTION:=net 
     351  CATEGORY:=Network 
     352  TITLE:=Common UNIX Printing System - Locale eu 
     353endef 
     354 
     355define Package/cups-locale-eu/description 
     356        Common UNIX Printing System - Locale eu 
     357endef 
     358 
     359define Package/cups-locale-fr 
     360$(call Package/cups/Default) 
     361  SECTION:=net 
     362  CATEGORY:=Network 
     363  TITLE:=Common UNIX Printing System - Locale fr 
     364endef 
     365 
     366define Package/cups-locale-fr/description 
     367        Common UNIX Printing System - Locale fr 
     368endef 
     369 
     370define Package/cups-locale-it 
     371$(call Package/cups/Default) 
     372  SECTION:=net 
     373  CATEGORY:=Network 
     374  TITLE:=Common UNIX Printing System - Locale it 
     375endef 
     376 
     377define Package/cups-locale-it/description 
     378        Common UNIX Printing System - Locale it 
     379endef 
     380 
     381define Package/cups-locale-id 
     382$(call Package/cups/Default) 
     383  SECTION:=net 
     384  CATEGORY:=Network 
     385  TITLE:=Common UNIX Printing System - Locale id 
     386endef 
     387 
     388define Package/cups-locale-id/description 
     389        Common UNIX Printing System - Locale id 
    42390endef 
    43391 
     
    46394                --with-cups-user="nobody" \ 
    47395                --with-cups-group="nogroup" \ 
     396                --with-components="embedded" \ 
    48397                --without-perl \ 
    49398                --without-python \ 
     
    83432        rm -rf $(1)/etc/cups/certs 
    84433        ln -sf /tmp $(1)/etc/cups/certs 
    85         $(INSTALL_DIR) $(1)/usr/bin 
    86         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ 
    87434        rm -f $(1)/usr/bin/cups-config 
    88         $(INSTALL_DIR) $(1)/usr/lib 
    89         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups*.so* $(1)/usr/lib/ 
    90         $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups $(1)/usr/lib/ 
    91         $(INSTALL_DIR) $(1)/usr/share/cups/templates 
    92         $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl $(1)/usr/share/cups/templates/ 
     435        $(INSTALL_DIR) $(1)/usr/lib/cups 
     436        $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/backend $(1)/usr/lib/cups 
     437        $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/cgi-bin $(1)/usr/lib/cups 
     438        $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/daemon $(1)/usr/lib/cups 
     439        $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/driver $(1)/usr/lib/cups 
     440        $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/monitor $(1)/usr/lib/cups 
     441        $(INSTALL_DIR) $(1)/usr/lib/cups/filter 
     442        $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/filter/{commandtops,pstops} \ 
     443                $(PKG_INSTALL_DIR)/usr/lib/cups/filter/gziptoany \ 
     444                $(1)/usr/lib/cups/filter 
     445        $(INSTALL_DIR) $(1)/usr/share/cups/templates 
     446        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl \ 
     447                $(1)/usr/share/cups/templates/ 
    93448        $(INSTALL_DIR) $(1)/usr/share/cups/mime 
    94449        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/mime/* $(1)/usr/share/cups/mime/ 
    95450        $(INSTALL_DIR) $(1)/usr/share/doc/cups 
    96         $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(1)/usr/share/doc/cups/ 
    97         $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/*.css $(1)/usr/share/doc/cups/ 
    98         $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/images $(1)/usr/share/doc/cups/ 
     451        $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html \ 
     452                $(1)/usr/share/doc/cups/ 
     453        $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/*.css \ 
     454                $(1)/usr/share/doc/cups/ 
     455        $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/images \ 
     456                $(1)/usr/share/doc/cups/ 
    99457        $(INSTALL_DIR) $(1)/usr/sbin 
    100         $(INSTALL_BIN) \ 
    101                 $(PKG_INSTALL_DIR)/usr/sbin/{accept,cupsaddsmb,cupsctl,cupsd,cupsfilter,lpadmin,lpc,lpinfo,lpmove} \ 
    102                 $(1)/usr/sbin/ 
    103         (cd $(1)/usr/sbin; ln -sf accept reject; ln -sf accept cupsenable; ln -sf accept cupsdisable;) 
    104458        # overwrite default config with our own 
    105459        $(CP) ./files/etc/cups/* $(1)/etc/cups/ 
     
    107461        $(INSTALL_DIR) $(1)/etc/init.d 
    108462        $(INSTALL_BIN) ./files/cupsd.init $(1)/etc/init.d/cupsd 
     463        $(INSTALL_BIN) \ 
     464                $(PKG_INSTALL_DIR)/usr/sbin/{cupsctl,cupsd} \ 
     465                $(1)/usr/sbin/ 
     466endef 
     467 
     468define Package/cups-bsd/install 
     469        $(INSTALL_DIR) $(1)/usr/bin 
     470        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{lprm,lpq,lpr} $(1)/usr/bin/ 
     471        $(INSTALL_DIR) $(1)/usr/sbin 
     472        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/lpc $(1)/usr/sbin/ 
     473endef 
     474 
     475define Package/cups-client/install 
     476        $(INSTALL_DIR) $(1)/usr/bin 
     477        $(INSTALL_BIN) \ 
     478                $(PKG_INSTALL_DIR)/usr/bin/{lp,cancel,cupstestppd,cupstestdsc} \ 
     479                $(PKG_INSTALL_DIR)/usr/bin/{ipptool,lpoptions,lpstat,lppasswd} \ 
     480                $(1)/usr/bin/ 
     481        $(INSTALL_DIR) $(1)/usr/sbin 
     482        $(INSTALL_BIN) \ 
     483                $(PKG_INSTALL_DIR)/usr/sbin/{cupsaccept,cupsaddsmb,cupsfilter} \ 
     484                $(PKG_INSTALL_DIR)/usr/sbin/{lpadmin,lpinfo,lpmove} \ 
     485                $(1)/usr/sbin/ 
     486        (cd $(1)/usr/sbin; ln -sf cupsaccept accept; 
     487                ln -sf cupsaccept cupsenable; ln -sf cupsaccept cupsdisable; 
     488                ln -sf cupsaccept reject; ln -sf cupsaccept cupsreject;) 
     489endef 
     490 
     491define Package/cups-filters/install 
     492        $(INSTALL_DIR) $(1)/usr/lib/cups/filter 
     493        $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/filter/{bannertops,commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoepson,rastertopwg,rastertohp,rastertoescpx,rastertopclx,rastertolabel,texttops} \ 
     494                $(1)/usr/lib/cups/filter 
     495        (cd $(1)/usr/lib/cups/filter; ln -sf rastertolabel rastertodymo;) 
     496endef 
     497 
     498define Package/cups-ppdc/install 
     499        $(INSTALL_DIR) $(1)/usr/bin 
     500        $(INSTALL_BIN) \ 
     501                $(PKG_INSTALL_DIR)/usr/bin/{ppdc,ppdhtml,ppdi,ppdmerge,ppdpo} \ 
     502                $(1)/usr/bin/ 
     503endef 
     504 
     505define Package/libcups/install 
     506        $(INSTALL_DIR) $(1)/usr/lib 
     507        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so* $(1)/usr/lib/ 
     508endef 
     509 
     510define Package/libcupscgi/install 
     511        $(INSTALL_DIR) $(1)/usr/lib 
     512        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupscgi.so* $(1)/usr/lib/ 
     513endef 
     514 
     515define Package/libcupsdriver/install 
     516        $(INSTALL_DIR) $(1)/usr/lib 
     517        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsdriver.so* $(1)/usr/lib/ 
     518endef 
     519 
     520define Package/libcupsimage/install 
     521        $(INSTALL_DIR) $(1)/usr/lib 
     522        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsimage.so* $(1)/usr/lib/ 
     523endef 
     524 
     525define Package/libcupsmime/install 
     526        $(INSTALL_DIR) $(1)/usr/lib 
     527        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsmime.so* $(1)/usr/lib/ 
     528endef 
     529 
     530define Package/libcupsppdc/install 
     531        $(INSTALL_DIR) $(1)/usr/lib 
     532        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsppdc.so* $(1)/usr/lib/ 
     533endef 
     534 
     535define Package/cups-locale-de/install 
     536        $(INSTALL_DIR) $(1)/usr/share/locale 
     537        $(INSTALL_DIR) $(1)/usr/share/cups/templates 
     538        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/de $(1)/usr/share/locale/ 
     539        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/de \ 
     540                $(1)/usr/share/cups/templates/ 
     541endef 
     542 
     543define Package/cups-locale-nl/install 
     544        $(INSTALL_DIR) $(1)/usr/share/locale 
     545        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/nl $(1)/usr/share/locale/ 
     546endef 
     547 
     548define Package/cups-locale-hu/install 
     549        $(INSTALL_DIR) $(1)/usr/share/locale 
     550        $(INSTALL_DIR) $(1)/usr/share/cups/templates 
     551        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/hu $(1)/usr/share/locale/ 
     552        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/hu \ 
     553                $(1)/usr/share/cups/templates/ 
     554endef 
     555 
     556define Package/cups-locale-pt/install 
     557        $(INSTALL_DIR) $(1)/usr/share/locale 
     558        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/pt $(1)/usr/share/locale/ 
     559endef 
     560 
     561define Package/cups-locale-pt_BR/install 
     562        $(INSTALL_DIR) $(1)/usr/share/locale 
     563        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/pt_BR $(1)/usr/share/locale/ 
     564endef 
     565 
     566define Package/cups-locale-fi/install 
     567        $(INSTALL_DIR) $(1)/usr/share/locale 
     568        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/fi $(1)/usr/share/locale/ 
     569endef 
     570 
     571define Package/cups-locale-sv/install 
     572        $(INSTALL_DIR) $(1)/usr/share/locale 
     573        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/sv $(1)/usr/share/locale/ 
     574endef 
     575 
     576define Package/cups-locale-da/install 
     577        $(INSTALL_DIR) $(1)/usr/share/locale 
     578        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/da $(1)/usr/share/locale/ 
     579endef 
     580 
     581define Package/cups-locale-ko/install 
     582        $(INSTALL_DIR) $(1)/usr/share/locale 
     583        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/ko $(1)/usr/share/locale/ 
     584endef 
     585 
     586define Package/cups-locale-zh/install 
     587        $(INSTALL_DIR) $(1)/usr/share/locale 
     588        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/zh $(1)/usr/share/locale/ 
     589endef 
     590 
     591define Package/cups-locale-ja/install 
     592        $(INSTALL_DIR) $(1)/usr/share/locale 
     593        $(INSTALL_DIR) $(1)/usr/share/cups/templates 
     594        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/ja $(1)/usr/share/locale/ 
     595        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/ja \ 
     596                $(1)/usr/share/cups/templates/ 
     597endef 
     598 
     599define Package/cups-locale-es/install 
     600        $(INSTALL_DIR) $(1)/usr/share/locale 
     601        $(INSTALL_DIR) $(1)/usr/share/cups/templates 
     602        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/es $(1)/usr/share/locale/ 
     603        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/es \ 
     604                $(1)/usr/share/cups/templates/ 
     605endef 
     606 
     607define Package/cups-locale-zh_TW/install 
     608        $(INSTALL_DIR) $(1)/usr/share/locale 
     609        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/zh_TW $(1)/usr/share/locale/ 
     610endef 
     611 
     612define Package/cups-locale-pl/install 
     613        $(INSTALL_DIR) $(1)/usr/share/locale 
     614        $(INSTALL_DIR) $(1)/usr/share/cups/templates 
     615        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/pl $(1)/usr/share/locale/ 
     616        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/pl \ 
     617                $(1)/usr/share/cups/templates/ 
     618endef 
     619 
     620define Package/cups-locale-no/install 
     621        $(INSTALL_DIR) $(1)/usr/share/locale 
     622        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/no $(1)/usr/share/locale/ 
     623endef 
     624 
     625define Package/cups-locale-ru/install 
     626        $(INSTALL_DIR) $(1)/usr/share/locale 
     627        $(INSTALL_DIR) $(1)/usr/share/cups/templates 
     628        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/ru $(1)/usr/share/locale/ 
     629        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/ru \ 
     630                $(1)/usr/share/cups/templates/ 
     631endef 
     632 
     633define Package/cups-locale-eu/install 
     634        $(INSTALL_DIR) $(1)/usr/share/locale 
     635        $(INSTALL_DIR) $(1)/usr/share/cups/templates 
     636        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/eu $(1)/usr/share/locale/ 
     637        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/eu \ 
     638                $(1)/usr/share/cups/templates/ 
     639endef 
     640 
     641define Package/cups-locale-fr/install 
     642        $(INSTALL_DIR) $(1)/usr/share/locale 
     643        $(INSTALL_DIR) $(1)/usr/share/cups/templates 
     644        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/fr $(1)/usr/share/locale/ 
     645        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/fr \ 
     646                $(1)/usr/share/cups/templates/ 
     647endef 
     648 
     649define Package/cups-locale-it/install 
     650        $(INSTALL_DIR) $(1)/usr/share/locale 
     651        $(INSTALL_DIR) $(1)/usr/share/cups/templates 
     652        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/it $(1)/usr/share/locale/ 
     653        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/it \ 
     654                $(1)/usr/share/cups/templates/ 
     655endef 
     656 
     657define Package/cups-locale-id/install 
     658        $(INSTALL_DIR) $(1)/usr/share/locale 
     659        $(INSTALL_DIR) $(1)/usr/share/cups/templates 
     660        $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/id $(1)/usr/share/locale/ 
     661        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/id \ 
     662                $(1)/usr/share/cups/templates/ 
    109663endef 
    110664 
     
    119673 
    120674$(eval $(call BuildPackage,cups)) 
     675$(eval $(call BuildPackage,libcups)) 
     676$(eval $(call BuildPackage,libcupscgi)) 
     677$(eval $(call BuildPackage,libcupsdriver)) 
     678$(eval $(call BuildPackage,libcupsimage)) 
     679$(eval $(call BuildPackage,libcupsmime)) 
     680$(eval $(call BuildPackage,libcupsppdc)) 
     681$(eval $(call BuildPackage,cups-bsd)) 
     682$(eval $(call BuildPackage,cups-client)) 
     683$(eval $(call BuildPackage,cups-filters)) 
     684$(eval $(call BuildPackage,cups-ppdc)) 
     685$(eval $(call BuildPackage,cups-locale-de)) 
     686$(eval $(call BuildPackage,cups-locale-nl)) 
     687$(eval $(call BuildPackage,cups-locale-hu)) 
     688$(eval $(call BuildPackage,cups-locale-pt)) 
     689$(eval $(call BuildPackage,cups-locale-pt_BR)) 
     690$(eval $(call BuildPackage,cups-locale-fi)) 
     691$(eval $(call BuildPackage,cups-locale-sv)) 
     692$(eval $(call BuildPackage,cups-locale-da)) 
     693$(eval $(call BuildPackage,cups-locale-ko)) 
     694$(eval $(call BuildPackage,cups-locale-zh)) 
     695$(eval $(call BuildPackage,cups-locale-ja)) 
     696$(eval $(call BuildPackage,cups-locale-es)) 
     697$(eval $(call BuildPackage,cups-locale-zh_TW)) 
     698$(eval $(call BuildPackage,cups-locale-pl)) 
     699$(eval $(call BuildPackage,cups-locale-no)) 
     700$(eval $(call BuildPackage,cups-locale-ru)) 
     701$(eval $(call BuildPackage,cups-locale-eu)) 
     702$(eval $(call BuildPackage,cups-locale-fr)) 
     703$(eval $(call BuildPackage,cups-locale-it)) 
     704$(eval $(call BuildPackage,cups-locale-id)) 
  • packages/net/cups/patches/100-makefile-targets.patch

    r32519 r34929  
    1 --- a/Makefile 
    2 +++ b/Makefile 
    3 @@ -20,8 +20,8 @@ include Makedefs 
    4  # Directories to make... 
    5  # 
    6   
    7 -DIRS   =       cups filter backend berkeley cgi-bin driver locale man monitor \ 
    8 -               notifier ppdc scheduler systemv test \ 
    9 +DIRS   =       cups filter backend berkeley cgi-bin driver monitor \ 
    10 +               ppdc scheduler systemv \ 
    11                 $(PHPDIR) \ 
    12                 conf data doc examples $(FONTS) templates 
    13   
  • packages/net/cups/patches/160-ppdc.patch

    r32519 r34929  
    1 --- a/ppdc/Makefile 
    2 +++ b/ppdc/Makefile 
    3 @@ -239,12 +239,7 @@ framedhelp: 
     1--- cups-1.5.4/ppdc/Makefile    2012-10-09 09:36:00.000000000 +0200 
     2+++ cups-1.5.4/ppdc/Makefile    2012-10-09 09:36:34.000000000 +0200 
     3@@ -239,12 +239,7 @@ 
    44  
    5  genstrings:            genstrings.o libcupsppdc.a ../cups/libcups.a \ 
     5 genstrings:            genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ 
    66                        sample.drv ../data/media.defs 
    77-       echo Linking $@... 
    88-       $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ 
    9 -               libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ 
     9-               libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ 
    1010-               $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) 
    1111-       echo Generating localization strings... 
Note: See TracChangeset for help on using the changeset viewer.