View | Details | Raw Unified | Return to bug 145146 | Differences between
and this patch

Collapse All | Expand All

(-)hplip3/Makefile (-4 / +5 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	hplip
8
PORTNAME=	hplip
9
PORTVERSION=	3.9.8
9
PORTVERSION=	3.10.2
10
PORTREVISION=	4
11
CATEGORIES=	print
10
CATEGORIES=	print
12
MASTER_SITES=	SF
11
MASTER_SITES=	SF
13
12
Lines 37-43 Link Here
37
		--with-cupsbackenddir=${LOCALBASE}/libexec/cups/backend \
36
		--with-cupsbackenddir=${LOCALBASE}/libexec/cups/backend \
38
		--with-cupsfilterdir=${LOCALBASE}/libexec/cups/filter \
37
		--with-cupsfilterdir=${LOCALBASE}/libexec/cups/filter \
39
		--with-drvdir=${LOCALBASE}/libexec/cups/driver \
38
		--with-drvdir=${LOCALBASE}/libexec/cups/driver \
40
		--with-hppddir=${LOCALBASE}/share/ppd/HP
39
		--with-hpppddir=${LOCALBASE}/share/ppd/HP \
40
		--with-mimedir=${LOCALBASE}/etc/cups
41
41
42
USE_LDCONFIG=	yes
42
USE_LDCONFIG=	yes
43
USE_GHOSTSCRIPT_RUN=	yes
43
USE_GHOSTSCRIPT_RUN=	yes
Lines 45-53 Link Here
45
USE_RC_SUBR=	hpssd
45
USE_RC_SUBR=	hpssd
46
MAKE_JOBS_SAFE=	yes
46
MAKE_JOBS_SAFE=	yes
47
SUB_FILES=	pkg-message
47
SUB_FILES=	pkg-message
48
PLIST_SUB=	VER=${PORTVERSION}
48
49
49
CPPFLAGS+=	-I${LOCALBASE}/include
50
CPPFLAGS+=	-I${LOCALBASE}/include
50
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
51
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lcompat
51
52
52
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
53
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
53
54
(-)hplip3/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (hplip-3.9.8.tar.gz) = cb1cf49c5f062993b78fc2768f531ed8
1
MD5 (hplip-3.10.2.tar.gz) = 4df6f16c47ae7edd015bf2cf5155f26f
2
SHA256 (hplip-3.9.8.tar.gz) = 6471d99bde2b1182f45082c50dbd9e424a3ec2c0e98c48c934a1cd0d4ccb4e36
2
SHA256 (hplip-3.10.2.tar.gz) = bb9a3aeda9a8d31f0cc790e629f14d2122f9bff111b0d3cc97ac19a8607d7956
3
SIZE (hplip-3.9.8.tar.gz) = 15715640
3
SIZE (hplip-3.10.2.tar.gz) = 21446275
(-)hplip3/pkg-plist (-43 / +72 lines)
Lines 34-39 Link Here
34
etc/hp/hplip.conf.sample
34
etc/hp/hplip.conf.sample
35
@exec if [ ! -f %B/hplip.conf ]; then cp -p %D/%F %B/hplip.conf; fi
35
@exec if [ ! -f %B/hplip.conf ]; then cp -p %D/%F %B/hplip.conf; fi
36
etc/xdg/autostart/hplip-systray.desktop
36
etc/xdg/autostart/hplip-systray.desktop
37
etc/cups/pstotiff.convs
38
etc/cups/pstotiff.types
37
lib/libhpip.la
39
lib/libhpip.la
38
lib/libhpip.so
40
lib/libhpip.so
39
lib/libhpip.so.0
41
lib/libhpip.so.0
Lines 55-98 Link Here
55
libexec/cups/filter/hpcups
57
libexec/cups/filter/hpcups
56
libexec/cups/filter/hpcupsfax
58
libexec/cups/filter/hpcupsfax
57
libexec/cups/filter/hplipjs
59
libexec/cups/filter/hplipjs
60
libexec/cups/filter/pstotiff
58
libexec/cups/backend/hp
61
libexec/cups/backend/hp
59
libexec/cups/backend/hpfax
62
libexec/cups/backend/hpfax
60
libexec/cups/driver/hpcups.drv
63
libexec/cups/driver/hpcups.drv
61
libexec/cups/filter/foomatic-rip-hplip
64
libexec/cups/filter/foomatic-rip-hplip
62
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/COPYING
65
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/COPYING
63
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/README_LIBJPG
66
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/README_LIBJPG
64
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/commandline.html
67
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/commandline.html
65
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/copying.html
68
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/copying.html
66
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/copyright
69
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/copyright
67
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/devicemanager.html
70
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/devicemanager.html
68
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/faxtrouble.html
71
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/faxtrouble.html
69
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/gettinghelp.html
72
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/gettinghelp.html
70
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/hpscan.html
73
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/hpscan.html
71
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/favicon.ico
74
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/favicon.ico
72
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/print.png
75
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/print.png
73
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_actions.png
76
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/toolbox_actions.png
74
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_fax.png
77
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/toolbox_fax.png
75
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_print_control.png
78
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/toolbox_print_control.png
76
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_print_settings.png
79
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/toolbox_print_settings.png
77
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_status.png
80
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/toolbox_status.png
78
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_supplies.png
81
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/toolbox_supplies.png
79
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/xsane.png
82
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/images/xsane.png
80
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/index.html
83
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/index.html
81
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/mainttask.html
84
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/mainttask.html
82
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/plugins.html
85
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/plugins.html
83
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/print.html
86
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/print.html
84
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/printing.html
87
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/printing.html
85
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/printoptions.html
88
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/printoptions.html
86
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/printtroubleshooting.html
89
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/printtroubleshooting.html
87
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/scanning.html
90
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/scanning.html
88
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/scantrouble.html
91
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/scantrouble.html
89
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/sendfax.html
92
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/sendfax.html
90
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/setup.html
93
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/setup.html
91
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/styles/css.css
94
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/styles/css.css
92
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/systray.html
95
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/systray.html
93
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/troubleshooting.html
96
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/troubleshooting.html
94
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/uninstalling.html
97
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/uninstalling.html
95
%%PORTDOCS%%%%DOCSDIR%%-3.9.8/upgrading.html
98
%%PORTDOCS%%%%DOCSDIR%%-%%VER%%/upgrading.html
96
%%DATADIR%%/__init__.py
99
%%DATADIR%%/__init__.py
97
%%DATADIR%%/align.py
100
%%DATADIR%%/align.py
98
%%DATADIR%%/base/__init__.py
101
%%DATADIR%%/base/__init__.py
Lines 233-238 Link Here
233
%%DATADIR%%/data/images/32x32/warning.png
236
%%DATADIR%%/data/images/32x32/warning.png
234
%%DATADIR%%/data/images/32x32/wireless.png
237
%%DATADIR%%/data/images/32x32/wireless.png
235
%%DATADIR%%/data/images/64x64/hp_logo.png
238
%%DATADIR%%/data/images/64x64/hp_logo.png
239
%%DATADIR%%/data/images/256x256/logo.png
236
%%DATADIR%%/data/images/devices/120.png
240
%%DATADIR%%/data/images/devices/120.png
237
%%DATADIR%%/data/images/devices/COLOR_INKJET_PRINTER_CP1700.png
241
%%DATADIR%%/data/images/devices/COLOR_INKJET_PRINTER_CP1700.png
238
%%DATADIR%%/data/images/devices/CP_1700.png
242
%%DATADIR%%/data/images/devices/CP_1700.png
Lines 480-485 Link Here
480
%%DATADIR%%/fax/faxdevice.py
484
%%DATADIR%%/fax/faxdevice.py
481
%%DATADIR%%/fax/pmlfax.py
485
%%DATADIR%%/fax/pmlfax.py
482
%%DATADIR%%/fax/soapfax.py
486
%%DATADIR%%/fax/soapfax.py
487
%%DATADIR%%/fax/marvellfax.py
488
%%DATADIR%%/fax/pstotiff
489
%%DATADIR%%/fax/pstotiff.convs
490
%%DATADIR%%/fax/pstotiff.types
483
%%DATADIR%%/faxsetup.py
491
%%DATADIR%%/faxsetup.py
484
%%DATADIR%%/firmware.py
492
%%DATADIR%%/firmware.py
485
%%DATADIR%%/hpdio.py
493
%%DATADIR%%/hpdio.py
Lines 940-952 Link Here
940
share/ppd/HP/hp-laserjet_3055-hpijs.ppd.gz
948
share/ppd/HP/hp-laserjet_3055-hpijs.ppd.gz
941
share/ppd/HP/hp-laserjet_3100-hpijs.ppd.gz
949
share/ppd/HP/hp-laserjet_3100-hpijs.ppd.gz
942
share/ppd/HP/hp-laserjet_3150-hpijs.ppd.gz
950
share/ppd/HP/hp-laserjet_3150-hpijs.ppd.gz
943
share/ppd/HP/hp-laserjet_3200-hpijs-pcl3.ppd.gz
944
share/ppd/HP/hp-laserjet_3200-ps.ppd.gz
945
share/ppd/HP/hp-laserjet_3200_series-ps.ppd.gz
946
share/ppd/HP/hp-laserjet_3200m-hpijs.ppd.gz
947
share/ppd/HP/hp-laserjet_3200m-ps.ppd.gz
951
share/ppd/HP/hp-laserjet_3200m-ps.ppd.gz
948
share/ppd/HP/hp-laserjet_3200se-hpijs.ppd.gz
952
share/ppd/HP/hp-laserjet_3200se-hpijs.ppd.gz
949
share/ppd/HP/hp-laserjet_3200se-ps.ppd.gz
950
share/ppd/HP/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz
953
share/ppd/HP/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz
951
share/ppd/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz
954
share/ppd/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz
952
share/ppd/HP/hp-laserjet_3330-hpijs.ppd.gz
955
share/ppd/HP/hp-laserjet_3330-hpijs.ppd.gz
Lines 1171-1177 Link Here
1171
share/ppd/HP/hp-officejet_g85xi-hpijs.ppd.gz
1174
share/ppd/HP/hp-officejet_g85xi-hpijs.ppd.gz
1172
share/ppd/HP/hp-officejet_g95-hpijs.ppd.gz
1175
share/ppd/HP/hp-officejet_g95-hpijs.ppd.gz
1173
share/ppd/HP/hp-officejet_h470-hpijs.ppd.gz
1176
share/ppd/HP/hp-officejet_h470-hpijs.ppd.gz
1174
share/ppd/HP/hp-officejet_j3500_series-hpijs.ppd.gz
1175
share/ppd/HP/hp-officejet_j3600_series-hpijs.ppd.gz
1177
share/ppd/HP/hp-officejet_j3600_series-hpijs.ppd.gz
1176
share/ppd/HP/hp-officejet_j4500_series-hpijs.ppd.gz
1178
share/ppd/HP/hp-officejet_j4500_series-hpijs.ppd.gz
1177
share/ppd/HP/hp-officejet_j4660_series-hpijs.ppd.gz
1179
share/ppd/HP/hp-officejet_j4660_series-hpijs.ppd.gz
Lines 1356-1361 Link Here
1356
share/ppd/HP/hp-deskjet_670c-hpijs.ppd.gz
1358
share/ppd/HP/hp-deskjet_670c-hpijs.ppd.gz
1357
share/ppd/HP/hp-deskjet_d1600_series-hpijs.ppd.gz
1359
share/ppd/HP/hp-deskjet_d1600_series-hpijs.ppd.gz
1358
share/ppd/HP/hp-deskjet_d5500_series-hpijs.ppd.gz
1360
share/ppd/HP/hp-deskjet_d5500_series-hpijs.ppd.gz
1361
share/ppd/HP/HP-Fax3-hpcups.ppd.gz
1362
share/ppd/HP/HP-Fax3-hpijs.ppd.gz
1363
share/ppd/HP/hp-color_laserjet_cp5225-ps.ppd.gz
1364
share/ppd/HP/hp-color_laserjet_cm6040_mfp-ps.ppd.gz
1365
share/ppd/HP/hp-color_laserjet_cp5225n-ps.ppd.gz
1366
share/ppd/HP/hp-color_laserjet_cp4020_series-ps.ppd.gz
1367
share/ppd/HP/hp-designjet_t770_postscript-ps.ppd.gz
1368
share/ppd/HP/hp-designjet_t1120ps_24in-ps.ppd.gz
1369
share/ppd/HP/hp-color_laserjet_cp5225dn-ps.ppd.gz
1370
share/ppd/HP/hp-designjet_t770ps_24in-ps.ppd.gz
1371
share/ppd/HP/hp-color_laserjet_cp4520_series-ps.ppd.gz
1372
share/ppd/HP/hp-designjet_t1120ps_44in-ps.ppd.gz
1373
share/ppd/HP/hp-designjet_t1200_postscript-ps.ppd.gz
1374
share/ppd/HP/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz
1375
share/ppd/HP/hp-photosmart_b109a_series-hpijs.ppd.gz
1376
share/ppd/HP/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz
1377
share/ppd/HP/hp-deskjet_f4500_series-hpijs.ppd.gz
1378
share/ppd/HP/hp-deskjet_f2400_series-hpijs.ppd.gz
1379
share/ppd/HP/hp-officejet_4500_g510g-m-hpijs.ppd.gz
1380
share/ppd/HP/hp-photosmart_premium_c309g-m-hpijs.ppd.gz
1381
share/ppd/HP/hp-laserjet_3200-hpijs.ppd.gz
1382
share/ppd/HP/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz
1383
share/ppd/HP/hp-officejet_4500_g510a-f-hpijs.ppd.gz
1384
share/ppd/HP/hp-laserjet_3200m-hpijs-pcl3.ppd.gz
1385
share/ppd/HP/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz
1386
share/ppd/HP/hp-photosmart_a640_series-hpijs.ppd.gz
1359
share/applications/hplip.desktop
1387
share/applications/hplip.desktop
1360
@dirrmtry share/ppd/HP
1388
@dirrmtry share/ppd/HP
1361
@dirrmtry share/ppd
1389
@dirrmtry share/ppd
Lines 1385-1393 Link Here
1385
@dirrm %%DATADIR%%/copier
1413
@dirrm %%DATADIR%%/copier
1386
@dirrm %%DATADIR%%/base
1414
@dirrm %%DATADIR%%/base
1387
@dirrm %%DATADIR%%
1415
@dirrm %%DATADIR%%
1388
%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.8/styles
1416
%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%VER%%/styles
1389
%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.8/images
1417
%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%VER%%/images
1390
%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.8
1418
%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%VER%%
1391
@dirrmtry share/applications
1419
@dirrmtry share/applications
1392
@dirrmtry lib/sane
1420
@dirrmtry lib/sane
1393
@dirrmtry lib/python2.5/site-packages
1421
@dirrmtry lib/python2.5/site-packages
Lines 1398-1403 Link Here
1398
@dirrmtry etc/hp
1426
@dirrmtry etc/hp
1399
@dirrmtry etc/xdg/autostart
1427
@dirrmtry etc/xdg/autostart
1400
@dirrmtry etc/xdg
1428
@dirrmtry etc/xdg
1429
@dirrmtry etc/cups
1401
@exec mkdir -p %D/%%DATADIR%%/ui4/plugins
1430
@exec mkdir -p %D/%%DATADIR%%/ui4/plugins
1402
@exec echo hpaio >> %D/etc/sane.d/dll.conf
1431
@exec echo hpaio >> %D/etc/sane.d/dll.conf
1403
@unexec sed -i "" -e '/^hpaio$/d' %D/etc/sane.d/dll.conf
1432
@unexec sed -i "" -e '/^hpaio$/d' %D/etc/sane.d/dll.conf
(-)hplip3/files/patch-Makefile.am (-20 / +4 lines)
Lines 1-22 Link Here
1
--- Makefile.am.orig	2009-06-18 01:00:23.000000000 +0400
1
--- Makefile.am.old	2010-03-28 15:08:50.000000000 -0600
2
+++ Makefile.am	2009-06-29 02:25:37.000000000 +0400
2
+++ Makefile.am	2010-03-28 15:09:28.000000000 -0600
3
@@ -24,11 +24,11 @@
3
@@ -90,15 +90,15 @@
4
 if DOC_BUILD
4
 hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
5
 wwwsrc = doc
6
 www0dir = $(docdir)
7
-dist_www0_DATA = $(wwwsrc)/index.html $(wwwsrc)/commandline.html $(wwwsrc)/copying.html $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html $(wwwsrc)/print.html $(wwwsrc)/printing.html $(wwwsrc)/printoptions.html $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html $(wwwsrc)/setup.html $(wwwsrc)/systray.html $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html $(wwwsrc)/upgrading.html
8
+dist_www0_DATA = $(wwwsrc)/*.html
9
 www3dir = $(docdir)/styles
10
-dist_www3_DATA = $(wwwsrc)/styles/*
11
+dist_www3_DATA = $(wwwsrc)/styles/*.css
12
 www4dir = $(docdir)/images
13
-dist_www4_DATA = $(wwwsrc)/images/*
14
+dist_www4_DATA = $(wwwsrc)/images/*.png $(wwwsrc)/images/*.ico
15
 endif
16
 
17
 if HPLIP_BUILD
18
@@ -89,15 +89,16 @@
19
 hp_mkuri_LDADD = -ldl libhpmud.la
20
 
5
 
21
 # hpmud.rules
6
 # hpmud.rules
22
-rulesdir = /etc/udev/rules.d
7
-rulesdir = /etc/udev/rules.d
Lines 28-34 Link Here
28
-endif
13
-endif
29
-halpredir = /usr/share/hal/fdi/preprobe/10osvendor
14
-halpredir = /usr/share/hal/fdi/preprobe/10osvendor
30
-dist_halpre_DATA = data/rules/20-hplip-devices.fdi
15
-dist_halpre_DATA = data/rules/20-hplip-devices.fdi
31
+# FreeBSD doesn't use udev so why install the rules?
32
+#rulesdir = /etc/udev/rules.d
16
+#rulesdir = /etc/udev/rules.d
33
+#dist_rules_DATA = data/rules/56-hpmud_support.rules
17
+#dist_rules_DATA = data/rules/56-hpmud_support.rules
34
+#if UDEV_ACL_RULES
18
+#if UDEV_ACL_RULES
(-)hplip3/files/patch-Makefile.in (-31 / +26 lines)
Lines 1-33 Link Here
1
--- Makefile.in.old	2009-06-22 23:34:25.000000000 -0500
1
--- Makefile.in.old	2010-03-28 15:07:10.000000000 -0600
2
+++ Makefile.in	2009-06-22 23:41:26.000000000 -0500
2
+++ Makefile.in	2010-03-28 15:08:01.000000000 -0600
3
@@ -2006,22 +2006,11 @@
3
@@ -89,8 +89,8 @@
4
 	data/rules/40-hplip.rules data/rules/55-hpmud.rules
4
 # ip library
5
 dist_rulesDATA_INSTALL = $(INSTALL_DATA)
5
 @HPLIP_BUILD_TRUE@am__append_1 = libhpmud.la libhpip.la
6
 dist_unrelDATA_INSTALL = $(INSTALL_DATA)
6
 @HPLIP_BUILD_TRUE@hp_mkuri_PROGRAMS = hp-mkuri$(EXEEXT)
7
-am__dist_www0_DATA_DIST = $(wwwsrc)/index.html \
7
-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules
8
-	$(wwwsrc)/commandline.html $(wwwsrc)/copying.html \
8
-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules
9
-	$(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html \
9
+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules
10
-	$(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html \
10
+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules
11
-	$(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html \
11
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_4 =  \
12
-	$(wwwsrc)/print.html $(wwwsrc)/printing.html \
12
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	scan/sane/hpaio.desc \
13
-	$(wwwsrc)/printoptions.html \
13
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	prnt/drv/hpijs.drv.in.template \
14
-	$(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html \
14
@@ -2041,8 +2041,8 @@
15
-	$(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html \
15
 	ppd/hpcups/hp-psc_950vr.ppd.gz ppd/hpcups/hp-psc_950xi.ppd.gz
16
-	$(wwwsrc)/setup.html $(wwwsrc)/systray.html \
16
 am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \
17
-	$(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html \
17
 	prnt/pcl.py prnt/colorcal.py
18
-	$(wwwsrc)/upgrading.html
18
-am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
19
+am__dist_www0_DATA_DIST = $(wwwsrc)/*.html
19
-	data/rules/40-hplip.rules data/rules/55-hpmud.rules
20
 dist_www0DATA_INSTALL = $(INSTALL_DATA)
20
+#am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
21
-am__dist_www3_DATA_DIST = $(wwwsrc)/styles/*
21
+#	data/rules/40-hplip.rules data/rules/55-hpmud.rules
22
+am__dist_www3_DATA_DIST = $(wwwsrc)/styles/*.css
22
 am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py
23
 dist_www3DATA_INSTALL = $(INSTALL_DATA)
23
 am__dist_ui_DATA_DIST = ui/alignform.py ui/colorcalform_base.py \
24
-am__dist_www4_DATA_DIST = $(wwwsrc)/images/*
24
 	ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py \
25
+am__dist_www4_DATA_DIST = $(wwwsrc)/images/*.png $(wwwsrc)/images/*.ico
25
@@ -3777,11 +3777,11 @@
26
 dist_www4DATA_INSTALL = $(INSTALL_DATA)
26
 @HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
27
 docDATA_INSTALL = $(INSTALL_DATA)
28
 hplip_confDATA_INSTALL = $(INSTALL_DATA)
29
@@ -3679,11 +3668,12 @@
30
 @HPLIP_BUILD_TRUE@hp_mkuri_LDADD = -ldl libhpmud.la
31
 
27
 
32
 # hpmud.rules
28
 # hpmud.rules
33
-@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
29
-@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
Lines 35-41 Link Here
35
-@HPLIP_BUILD_TRUE@	$(am__append_2) $(am__append_3)
31
-@HPLIP_BUILD_TRUE@	$(am__append_2) $(am__append_3)
36
-@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
32
-@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
37
-@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
33
-@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
38
+# same applys here.
39
+#@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
34
+#@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
40
+#@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
35
+#@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
41
+#@HPLIP_BUILD_TRUE@	$(am__append_2) $(am__append_3)
36
+#@HPLIP_BUILD_TRUE@	$(am__append_2) $(am__append_3)

Return to bug 145146