head	1.2;
access;
symbols
	RELEASE_8_3_0:1.2;
locks; strict;
comment	@# @;


1.2
date	2012.02.14.19.17.12;	author pgollucci;	state Exp;
branches;
next	1.1;

1.1
date	2012.02.12.20.35.44;	author pgollucci;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Bump PORTREVISION
- Better/different fix for /dev/null issue

PR:             ports/165096
Submitted by:   Jui-Nan Lin <jnlin@@csie.nctu.edu.tw> (maintainer)
@
text
@--- Makefile.orig	2012-01-18 18:05:11.000000000 +0800
+++ Makefile	2012-02-13 21:43:14.409460968 +0800
@@@@ -24,8 +24,6 @@@@
                 echo ' -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT')              \
               -fvisibility=hidden $(CFLAGS)
 DEF_LDFLAGS := $(shell [ `uname` = SunOS ] && echo ' -mimpure-text') $(LDFLAGS)
-LDL_LDFLAGS := $(shell $(CC) -shared -ldl -xc -o /dev/null /dev/null          \
-                       >/dev/null 2>&1 && echo ' -ldl')
 
 all: google-authenticator pam_google_authenticator.so demo                    \
      pam_google_authenticator_unittest
@@@@ -60,14 +58,14 @@@@
 	               pam_google_authenticator_unittest
 
 google-authenticator: google-authenticator.o base32.o hmac.o sha1.o
-	$(CC) -g $(DEF_LDFLAGS) -o $@@ $+ $(LDL_LDFLAGS)
+	$(CC) -g $(DEF_LDFLAGS) -o $@@ $+
 
 demo: demo.o pam_google_authenticator_demo.o base32.o hmac.o sha1.o
-	$(CC) -g $(DEF_LDFLAGS) -rdynamic -o $@@ $+ $(LDL_LDFLAGS)
+	$(CC) -g $(DEF_LDFLAGS) -rdynamic -o $@@ $+
 
 pam_google_authenticator_unittest: pam_google_authenticator_unittest.o        \
                                    base32.o hmac.o sha1.o
-	$(CC) -g $(DEF_LDFLAGS) -rdynamic -o $@@ $+ -lc $(LDL_LDFLAGS)
+	$(CC) -g $(DEF_LDFLAGS) -rdynamic -o $@@ $+ -lc
 
 pam_google_authenticator.so: base32.o hmac.o sha1.o
 pam_google_authenticator_testing.so: base32.o hmac.o sha1.o
@


1.1
log
@- Patch the port to not remove /dev/null

Reported by:    many
Pointy Hat To:  myself
@
text
@d1 3
a3 3
--- ./Makefile.orig	2012-02-12 20:34:01.605839492 +0000
+++ ./Makefile	2012-02-12 20:34:11.541834894 +0000
@@@@ -24,8 +24,7 @@@@
a8 1
+LDL_LDFLAGS := $(shell $(CC) -shared -ldl -xc >/dev/null 2>&1 && echo ' -ldl')
d12 18
@

