Check-in [fcd8688f0e]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:motif.mk now respect properly WANT_LESSTIF
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:fcd8688f0edd03c8de1b9dc8678f0727a4ea7b23
User & Date: bapt 2013-07-07 11:51:41
Context
2013-07-07
11:56
Chase the latest ports check-in: 513ab8e2dc user: bapt tags: trunk
11:51
motif.mk now respect properly WANT_LESSTIF check-in: fcd8688f0e user: bapt tags: trunk
11:46
Chase the motif change check-in: cad7f57caa user: bapt tags: trunk
Changes

Changes to motif.patch.

55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
..
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86


87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106




107
108
109
110
111
112
113
...
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374









375
376
377
378
379
380
381
 INSTALL_TARGET+=	${LATE_INSTALL_ARGS}
Index: Mk/Uses/motif.mk
===================================================================
diff --git a/head/Mk/Uses/motif.mk b/head/Mk/Uses/motif.mk
new file mode 10644
--- /dev/null	(revision 0)
+++ b/head/Mk/Uses/motif.mk	(working copy)
@@ -0,0 +1,30 @@
+# $FreeBSD$
+#
+# handle dependency on motif
+#
+# MAINTAINER: portmgr@FreeBSD.org
+#
+# Feature:	motif
................................................................................
+# Usage:	USES=motif or USES=motif:ARGS
+# Valid ARGS:	motif (default, implicit), lesstif
+
+.if !defined(_INCLUDE_USES_MOTIF_MK)
+_INCLUDE_USES_MOTIF_MK=	yes
+
+.if !defined(motif_ARGS)
+motif_ARGS=	motif
+.endif
+
+.if ${motif_ARGS} == motif
+USE_XORG+=	xpm
+LIB_DEPENDS+=		libXm.so.4:${PORTSDIR}/x11-toolkits/open-motif
+.elif ${motif_ARGS} == lesstif
+LIB_DEPENDS+=		libXm.so:${PORTSDIR}/x11-toolkits/lesstif
+.else
+IGNORE=	USES=motif - invalid args: [${motif_ARGS}] specified


+.endif
+
+MOTIFLIB?=	-L${LOCALBASE}/lib -lXm -lXp
+MAKE_ENV+=	MOTIFLIB="${MOTIFLIB}"
+
+.endif

Property changes on: head/Mk/Uses/motif.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H




\ No newline at end of property
Index: astro/xmoontool/Makefile
===================================================================
diff --git a/head/astro/xmoontool/Makefile b/head/astro/xmoontool/Makefile
--- a/head/astro/xmoontool/Makefile	(revision 322413)
+++ b/head/astro/xmoontool/Makefile	(working copy)
@@ -1,9 +1,5 @@
................................................................................
diff --git a/head/biology/emboss/Makefile b/head/biology/emboss/Makefile
--- a/head/biology/emboss/Makefile	(revision 322413)
+++ b/head/biology/emboss/Makefile	(working copy)
@@ -22,12 +22,11 @@
 
 PREFIX?=	${LOCALBASE}/emboss
 NO_MTREE=	yes
+USES=		gmake motif
 USE_SUBMAKE=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_MOTIF=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	PREFIX=${PREFIX} DATADIR=${DATADIR}
 









Index: biology/ncbi-toolkit/Makefile
===================================================================
diff --git a/head/biology/ncbi-toolkit/Makefile b/head/biology/ncbi-toolkit/Makefile
--- a/head/biology/ncbi-toolkit/Makefile	(revision 322413)
+++ b/head/biology/ncbi-toolkit/Makefile	(working copy)
@@ -13,7 +13,7 @@
 







|







 







|


|
<
<
<


<
>
>









<
<
<
<







>
>
>
>







 







|









>
>
>
>
>
>
>
>
>







55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
..
70
71
72
73
74
75
76
77
78
79
80



81
82

83
84
85
86
87
88
89
90
91
92
93




94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
...
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
 INSTALL_TARGET+=	${LATE_INSTALL_ARGS}
Index: Mk/Uses/motif.mk
===================================================================
diff --git a/head/Mk/Uses/motif.mk b/head/Mk/Uses/motif.mk
new file mode 10644
--- /dev/null	(revision 0)
+++ b/head/Mk/Uses/motif.mk	(working copy)
@@ -0,0 +1,28 @@
+# $FreeBSD$
+#
+# handle dependency on motif
+#
+# MAINTAINER: portmgr@FreeBSD.org
+#
+# Feature:	motif
................................................................................
+# Usage:	USES=motif or USES=motif:ARGS
+# Valid ARGS:	motif (default, implicit), lesstif
+
+.if !defined(_INCLUDE_USES_MOTIF_MK)
+_INCLUDE_USES_MOTIF_MK=	yes
+
+.if !defined(motif_ARGS)
+IGNORE=	USES=motif takes no arguments
+.endif
+
+.if defined(WANT_LESSTIF)



+LIB_DEPENDS+=		libXm.so:${PORTSDIR}/x11-toolkits/lesstif
+.else

+USE_XORG+=	xpm
+LIB_DEPENDS+=		libXm.so.4:${PORTSDIR}/x11-toolkits/open-motif
+.endif
+
+MOTIFLIB?=	-L${LOCALBASE}/lib -lXm -lXp
+MAKE_ENV+=	MOTIFLIB="${MOTIFLIB}"
+
+.endif

Property changes on: head/Mk/Uses/motif.mk
___________________________________________________________________




Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: astro/xmoontool/Makefile
===================================================================
diff --git a/head/astro/xmoontool/Makefile b/head/astro/xmoontool/Makefile
--- a/head/astro/xmoontool/Makefile	(revision 322413)
+++ b/head/astro/xmoontool/Makefile	(working copy)
@@ -1,9 +1,5 @@
................................................................................
diff --git a/head/biology/emboss/Makefile b/head/biology/emboss/Makefile
--- a/head/biology/emboss/Makefile	(revision 322413)
+++ b/head/biology/emboss/Makefile	(working copy)
@@ -22,12 +22,11 @@
 
 PREFIX?=	${LOCALBASE}/emboss
 NO_MTREE=	yes
+USES=		gmake
 USE_SUBMAKE=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_MOTIF=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	PREFIX=${PREFIX} DATADIR=${DATADIR}
 
@@ -38,7 +37,7 @@
 
 .if !defined(WITHOUT_X11)
 USE_XORG=	x11
-USE_MOTIF=	yes
+USES+=		motif
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd \
 		png15:${PORTSDIR}/graphics/png
 .else
Index: biology/ncbi-toolkit/Makefile
===================================================================
diff --git a/head/biology/ncbi-toolkit/Makefile b/head/biology/ncbi-toolkit/Makefile
--- a/head/biology/ncbi-toolkit/Makefile	(revision 322413)
+++ b/head/biology/ncbi-toolkit/Makefile	(working copy)
@@ -13,7 +13,7 @@